Update the default value for number of UDP listeners (#40761)

diff --git a/CHANGES b/CHANGES
index 1b67eb5abcdfaca17d9405c9c653c4a5c1c8ab17..839154de160fc204c5a10bfde98c77c8861b932a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4236.  [func]          Set the default value for the number of UDP listeners
+                       to the number of detected processors (CPU). [RT #40761]
+
 4235.  [func]          Added support in named for "dnstap", a fast method of
                        capturing and logging DNS traffic, and a new command
                        "dnstap-read" to read a dnstap log file.  Use

diff --git a/bin/named/main.c b/bin/named/main.c
index bdbbf921021faa0cf16ea535158076cc5d0b5971..ccfc7a3adfce82f4302210c31d25fd75cf974e3c 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -724,6 +724,8 @@ create_managers(void) {
        isc_result_t result;
        unsigned int socks;
 
+       INSIST(ns_g_cpus_detected > 0);
+
 #ifdef ISC_PLATFORM_USETHREADS
        if (ns_g_cpus == 0)
                ns_g_cpus = ns_g_cpus_detected;
@@ -740,10 +742,8 @@ create_managers(void) {
        if (ns_g_udpdisp == 0) {
                if (ns_g_cpus_detected == 1)
                        ns_g_udpdisp = 1;
-               else if (ns_g_cpus_detected < 4)
-                       ns_g_udpdisp = 2;
                else
-                       ns_g_udpdisp = ns_g_cpus_detected / 2;
+                       ns_g_udpdisp = ns_g_cpus_detected - 1;
        }
        if (ns_g_udpdisp > ns_g_cpus)
                ns_g_udpdisp = ns_g_cpus;

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 392b0386f34f2216319505a10d6c6e02ddd9cf9f..ac01c8d5bddbd57bf4bf26ce349bf89aa30f4422 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -663,6 +663,12 @@
           transport the query was received over.
        </para>
       </listitem>
+      <listitem>
+       <para>
+         The default value for the number of UDP listeners has been
+         changed to the number of detected processors (CPU).
+       </para>
+      </listitem>
     </itemizedlist>
   </sect2>
   <sect2 id="relnotes_port">