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'.

(cherry picked from commit 84df920d9e1e256e5132b10db098b1abfdda301e)

diff --git a/bin/named/config.c b/bin/named/config.c
index 0f25033cc27b1eeb8158d4b91cd76079e183f3bf..26cc9f3d14aea21eb9d826b0e09d463e41f6fb1e 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -174,7 +174,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 3c9f1447850f033bc83a29eb8da69b75c595f68c..1e4867b9a64ef4d0947f80b7ccd410f2e7239e07 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4704,7 +4704,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