Merge branch 'each-speedup-serve-stale-test' into 'master'

Speed up serve-stale test

See merge request isc-projects/bind9!3090

bin/rndc/rndc.c

@@ -160,7 +160,7 @@ command is one of the following:\n\
   scan		Scan available network interfaces for changes.\n\
   secroots [view ...]\n\
 		Write security roots to the secroots file.\n\
-  serve-stale [ yes | no | reset | status ] [class [view]]\n\
+  serve-stale [ on | off | reset | status ] [class [view]]\n\
 		Control whether stale answers are returned\n\
   showzone zone [class [view]]\n\
 		Print a zone's configuration.\n\
@@ -204,7 +204,7 @@ command is one of the following:\n\
 		Delete a TKEY-negotiated TSIG key.\n\
   tsig-list	List all currently active TSIG keys, including both statically\n\
 		configured and TKEY-negotiated keys.\n\
-  validation [ yes | no | status ] [view]\n\
+  validation [ on | off | status ] [view]\n\
 		Enable / disable DNSSEC validation.\n\
   zonestatus zone [class [view]]\n\
 		Display the current status of a zone.\n\

bin/tests/system/serve-stale/ns1/named1.conf.in

@@ -30,6 +30,7 @@ options {
 	max-stale-ttl 3600;
 	stale-answer-ttl 2;
 	stale-answer-enable yes;
+	servfail-ttl 0;
 };
 
 zone "." {

bin/tests/system/serve-stale/ns1/named2.conf.in

@@ -27,9 +27,10 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion yes;
-	max-stale-ttl 45;
+	max-stale-ttl 20;
 	stale-answer-ttl 3;
 	stale-answer-enable yes;
+	servfail-ttl 0;
 };
 
 zone "." {