mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

Merge branch '1877-reduce-default-for-max-stale-ttl-to-something-more-reasonable-12-hours-or-similar' into 'master'

Browse Source 
Resolve "Reduce default for max-stale-ttl to something more reasonable - 12 hours or similar"

Closes #1877

See merge request isc-projects/bind9!3593
This commit is contained in:
Ondřej Surý
2020-06-03 08:18:37 +00:00
parent b1dc79b5d7 e81728289c
commit aa71df65e9
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -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 5424. [bug] With kasp, when creating a successor key, the goal
state of the current active key (predecessor) was not state of the current active key (predecessor) was not
changed and thus was never is removed from the zone. changed and thus was never is removed from the zone.

2
bin/named/config.c
View File

@@ -170,7 +170,7 @@ options {\n\
max-ncache-ttl 10800; /* 3 hours */\n\ max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\ max-recursion-depth 7;\n\
max-recursion-queries 75;\n\ max-recursion-queries 75;\n\
max-stale-ttl 604800; /* 1 week */\n\ max-stale-ttl 43200; /* 12 hours */\n\
message-compression yes;\n\ message-compression yes;\n\
min-ncache-ttl 0; /* 0 hours */\n\ min-ncache-ttl 0; /* 0 hours */\n\
min-cache-ttl 0; /* 0 seconds */\n\ min-cache-ttl 0; /* 0 seconds */\n\

8
bin/tests/system/serve-stale/tests.sh
View File

@@ -21,6 +21,8 @@ waitfile () {
done done
} }
max_stale_ttl=$(sed -ne 's,^[[:space:]]*max-stale-ttl \([[:digit:]]*\).*,\1,p' $TOP_SRCDIR/bin/named/config.c)
status=0 status=0
n=0 n=0
@@ -723,7 +725,7 @@ n=$((n+1))
echo_i "check 'rndc serve-stale status' ($n)" echo_i "check 'rndc serve-stale status' ($n)"
ret=0 ret=0
$RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 $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 if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret)) status=$((status+ret))
@@ -804,7 +806,7 @@ n=$((n+1))
echo_i "check 'rndc serve-stale status' ($n)" echo_i "check 'rndc serve-stale status' ($n)"
ret=0 ret=0
$RNDCCMD 10.53.0.3 serve-stale status > rndc.out.test$n 2>&1 || ret=1 $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 if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret)) status=$((status+ret))
@@ -951,7 +953,7 @@ n=$((n+1))
echo_i "check 'rndc serve-stale status' ($n)" echo_i "check 'rndc serve-stale status' ($n)"
ret=0 ret=0
$RNDCCMD 10.53.0.4 serve-stale status > rndc.out.test$n 2>&1 || ret=1 $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 if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret)) status=$((status+ret))

2
doc/arm/reference.rst
View File

@@ -3264,7 +3264,7 @@ Tuning
If stale answers are enabled, ``max-stale-ttl`` sets the maximum time If stale answers are enabled, ``max-stale-ttl`` sets the maximum time
for which the server retains records past their normal expiry to for which the server retains records past their normal expiry to
return them as stale records, when the servers for those records are 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. second; a value of 0 is updated silently to 1 second.
For stale answers to be returned, they must be enabled, either in the For stale answers to be returned, they must be enabled, either in the

3
doc/notes/notes-current.rst
View File

@@ -100,6 +100,9 @@ Feature Changes
- ``dig +qid=<num>`` allows the user to specify a particular query ID - ``dig +qid=<num>`` allows the user to specify a particular query ID
for testing purposes. [GL #1851] for testing purposes. [GL #1851]
- The default value of ``max-stale-ttl`` has changed from 1 week to
12 hours.
Bug Fixes Bug Fixes
~~~~~~~~~ ~~~~~~~~~