Change default max-recursion-queries to 50

Changing the default for max-recursion-queries from 100 to 32 was too
strict in some cases, especially lookups in reverse IPv6 trees started
to fail more frequently. From issue #4921 it looks like 50 is a better
default.

Now that we have 'max-query-count' as a global limit of outgoing queries
per client request, we can increase the default for
'max-recursion-queries' again, as the number of recursive queries is
no longer bound by the multiple of 'max-recursion-queries' and
'max-query-restarts'.

diff --git a/bin/delv/delv.c b/bin/delv/delv.c
index 2ecaeb3ed70e76c22a7866f8d10a5e0945eddd95..3c7419581253deab09db255d8bc9b8e491f62928 100644 (file)
--- a/bin/delv/delv.c
+++ b/bin/delv/delv.c
@@ -93,7 +93,7 @@
 
 #define MAXNAME (DNS_NAME_MAXTEXT + 1)
 
-#define MAX_QUERIES  32
+#define MAX_QUERIES  50
 #define MAX_TOTAL    200
 #define MAX_RESTARTS 11
 

diff --git a/bin/delv/delv.rst b/bin/delv/delv.rst
index f8c2da680609d58c6f036d5cbb3d93c001df23d2..018161ecf126f746b971266db0999a889be2489c 100644 (file)
--- a/bin/delv/delv.rst
+++ b/bin/delv/delv.rst
@@ -351,7 +351,7 @@ assign values to options like the timeout interval. They have the form
 .. option:: +maxqueries
 
    This option specifies the maximum number of queries to send to resolve
-   a name before giving up. The default is 32.
+   a name before giving up. The default is 50.
 
 .. option:: +maxtotalqueries
 

diff --git a/bin/named/config.c b/bin/named/config.c
index 636b3393c28ce358ca42acc0a36fe68ceb4bbc72..d4d6b0b4f0cd08ce687751e348b219e57d132b60 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -168,7 +168,7 @@ options {\n\
        max-clients-per-query 100;\n\
        max-ncache-ttl 10800; /* 3 hours */\n\
        max-recursion-depth 7;\n\
-       max-recursion-queries 32;\n\
+       max-recursion-queries 50;\n\
        max-query-count 200;\n\
        max-query-restarts 11;\n\
        max-stale-ttl 86400; /* 1 day */\n\

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index bd3133e1422d00c8ba6d16dc8f8bd20b7a50d8be..17f9739dc3b80568d45f66f8254d8d89870561ef 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4501,7 +4501,7 @@ Tuning
    need to be sent before an answer is reached, then recursion is terminated
    and a SERVFAIL response is returned to the client. (Note: if the answer
    is a CNAME, then the subsequent lookup for the target of the CNAME is
-   counted separately.) The default is 32.
+   counted separately.) The default is 50.
 
 .. namedconf:statement:: max-query-restarts
    :tags: server, query