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 bfde4514724a33a530b6619fc7bfdf44c479a6dc..d2a8edc5db7cd6cec52e8e5e0be04bcb4faad0ca 100644 (file)
--- 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 758e0b7dadada0ef1dec4ee24affd0cc629a4cab..67b8625930c8ad684396f3c7b3e3f51d29a3b8eb 100644 (file)
--- 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();
 
     {