diff --git a/CHANGES b/CHANGES index e978a40968..49324e86a5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5425. [func] The default value of "max-stale-ttl" has been change + from 1 week to 12 hours. [GL #1877] + 5424. [bug] With kasp, when creating a successor key, the goal state of the current active key (predecessor) was not changed and thus was never is removed from the zone. diff --git a/bin/named/config.c b/bin/named/config.c index 121ddd1c12..b32a8a05c4 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -170,7 +170,7 @@ options {\n\ max-ncache-ttl 10800; /* 3 hours */\n\ max-recursion-depth 7;\n\ max-recursion-queries 75;\n\ - max-stale-ttl 604800; /* 1 week */\n\ + max-stale-ttl 43200; /* 12 hours */\n\ message-compression yes;\n\ min-ncache-ttl 0; /* 0 hours */\n\ min-cache-ttl 0; /* 0 seconds */\n\ diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh index e1a671dd56..c85fcfe28a 100755 --- a/bin/tests/system/serve-stale/tests.sh +++ b/bin/tests/system/serve-stale/tests.sh @@ -21,6 +21,8 @@ waitfile () { done } +max_stale_ttl=$(sed -ne 's,^[[:space:]]*max-stale-ttl \([[:digit:]]*\).*,\1,p' $TOP_SRCDIR/bin/named/config.c) + status=0 n=0 @@ -723,7 +725,7 @@ n=$((n+1)) echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 -grep '_default: off (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1 +grep "_default: off (stale-answer-ttl=1 max-stale-ttl=$max_stale_ttl)" rndc.out.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) @@ -804,7 +806,7 @@ n=$((n+1)) echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 -grep '_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1 +grep "_default: on (rndc) (stale-answer-ttl=1 max-stale-ttl=$max_stale_ttl)" rndc.out.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) @@ -951,7 +953,7 @@ n=$((n+1)) echo_i "check 'rndc serve-stale status' ($n)" ret=0 $RNDCCMD 10.53.0.4 serve-stale status > rndc.out.test$n 2>&1 || ret=1 -grep '_default: off (stale-answer-ttl=1 max-stale-ttl=604800)' rndc.out.test$n > /dev/null || ret=1 +grep "_default: off (stale-answer-ttl=1 max-stale-ttl=$max_stale_ttl)" rndc.out.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index aa4eedf86e..bfd18095b1 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -3264,7 +3264,7 @@ Tuning If stale answers are enabled, ``max-stale-ttl`` sets the maximum time for which the server retains records past their normal expiry to return them as stale records, when the servers for those records are - not reachable. The default is 1 week. The minimum allowed is 1 + not reachable. The default is 12 hours. The minimum allowed is 1 second; a value of 0 is updated silently to 1 second. For stale answers to be returned, they must be enabled, either in the diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index aa4bd02457..156b8f6da4 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -100,6 +100,9 @@ Feature Changes - ``dig +qid=`` allows the user to specify a particular query ID for testing purposes. [GL #1851] +- The default value of ``max-stale-ttl`` has changed from 1 week to + 12 hours. + Bug Fixes ~~~~~~~~~