From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 24 Dec 2024 10:43:07 +0000 (+0100)
Subject: dnsdist: Fix automatic computation of the number of TCP workers
X-Git-Tag: dnsdist-2.0.0-alpha1~160^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=373554e32e8e25fd42a82da4f42f124976e71bb5;p=thirdparty%2Fpdns.git

dnsdist: Fix automatic computation of the number of TCP workers

The previous method didn't account for TCP workers for backends.
---

diff --git a/pdns/dnsdistdist/dnsdist-configuration.hh b/pdns/dnsdistdist/dnsdist-configuration.hh
index bfde451472..d2a8edc5db 100644
--- a/pdns/dnsdistdist/dnsdist-configuration.hh
+++ b/pdns/dnsdistdist/dnsdist-configuration.hh
@@ -78,7 +78,7 @@ struct ImmutableConfiguration
   uint64_t d_outgoingTCPCleanupInterval{60};
   uint64_t d_outgoingDoHMaxIdlePerBackend{10};
   uint64_t d_outgoingTCPMaxIdlePerBackend{10};
-  uint64_t d_maxTCPClientThreads{0};
+  uint64_t d_maxTCPClientThreads{10};
   size_t d_maxTCPConnectionsPerClient{0};
   size_t d_udpVectorSize{1};
   size_t d_ringsCapacity{10000};
diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc
index 758e0b7dad..67b8625930 100644
--- a/pdns/dnsdistdist/dnsdist.cc
+++ b/pdns/dnsdistdist/dnsdist.cc
@@ -3383,12 +3383,6 @@ int main(int argc, char** argv)
       }
     }
 
-    if (dnsdist::configuration::getImmutableConfiguration().d_maxTCPClientThreads == 0 && tcpBindsCount > 0) {
-      dnsdist::configuration::updateImmutableConfiguration([](dnsdist::configuration::ImmutableConfiguration& config) {
-        config.d_maxTCPClientThreads = static_cast<size_t>(10);
-      });
-    }
-
     dnsdist::configuration::setImmutableConfigurationDone();
 
     {