3703. [func] Prefetch about to expire records if they are queried

for, see prefetch option for details. [RT #35041]

bin/tests/system/resolver/clean.sh

@@ -20,7 +20,9 @@
 # Clean up after resolver tests.
 #
 rm -f */named.memstats
-rm -f dig.out dig.*.out.*
+rm -f */*.jdb
+rm -f dig.out dig.out.*
+rm -f dig.*.out.*
 rm -f dig.*.foo.*
 rm -f dig.*.bar.*
 rm -f dig.*.prime.*

bin/tests/system/resolver/ns4/tld1.db

@@ -27,3 +27,4 @@ ns			A	10.53.0.4
 $TTL 5
 to-be-removed 		NS	ns.to-be-removed
 ns.to-be-removed	A	10.53.0.6
+fetch	10		TXT	A short ttl

bin/tests/system/resolver/ns4/tld2.db

@@ -24,3 +24,4 @@ $TTL 300
 				)
 @			NS	ns.tld.
 ns			A	10.53.0.4
+fetch  10              TXT     A short ttl

bin/tests/system/resolver/ns5/named.conf

@@ -16,7 +16,7 @@
 
 /* $Id: named.conf,v 1.4 2011/03/13 23:47:36 tbox Exp $ */
 
-// NS4
+// NS5
 
 controls { /* empty */ };
 

bin/tests/system/resolver/ns6/example.net.db.in

@@ -20,3 +20,4 @@ $TTL 600
 @	IN MX	0 mail
 ns	IN A	10.53.0.6
 mail	IN A	10.53.0.6
+fetch 10 IN TXT A short ttl

bin/tests/system/resolver/ns6/named.conf

@@ -16,7 +16,7 @@
 
 /* $Id: named.conf,v 1.4 2012/02/09 23:47:18 tbox Exp $ */
 
-// NS4
+// NS6
 
 controls { /* empty */ };
 

bin/tests/system/resolver/ns7/named1.conf

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-// NS4
+// NS7
 
 controls { /* empty */ };
 
@@ -29,6 +29,7 @@ options {
 	recursion yes;
 	empty-zones-enable yes;
 	disable-empty-zone 20.172.in-addr.arpa;
+	prefetch 0;
 };
 
 key rndc_key {

bin/tests/system/resolver/ns7/named2.conf

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-// NS4
+// NS7
 
 controls { /* empty */ };
 
@@ -29,6 +29,7 @@ options {
 	recursion yes;
 	empty-zones-enable yes;
 	disable-empty-zone 20.172.in-addr.arpa;
+	prefetch 0;
 };
 
 key rndc_key {

bin/tests/system/resolver/tests.sh

@@ -403,7 +403,6 @@ grep "not subdomain of zone" ns1/named.run > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-#HERE <<<
 cp ns7/named2.conf ns7/named.conf
 $RNDC -c ../common/rndc.conf -s 10.53.0.7 -p 9953 reconfig 2>&1 | sed 's/^/I:ns7 /'
 
@@ -415,7 +414,49 @@ grep "status: NOERROR" dig.ns7.out.${n} > /dev/null || ret=1
 grep "ANSWER: 1" dig.ns7.out.${n} > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
 status=`expr $status + $ret`
-#HERE >>>
+
+n=`expr $n + 1`
+echo "I:check prefetch (${n})"
+ret=0
+$DIG @10.53.0.5 -p 5300 fetch.tld txt > dig.out.1.${n} || ret=1
+ttl1=`awk '/"A" "short" "ttl"/ { print $2 - 2 }' dig.out.1.${n}`
+# sleep so we are in prefetch range
+sleep ${ttl1:-0}
+# trigger prefetch
+$DIG @10.53.0.5 -p 5300 fetch.tld txt > dig.out.2.${n} || ret=1
+ttl2=`awk '/"A" "short" "ttl"/ { print $2 }' dig.out.2.${n}`
+sleep 1
+# check that prefetch occured
+$DIG @10.53.0.5 -p 5300 fetch.tld txt > dig.out.3.${n} || ret=1
+ttl=`awk '/"A" "short" "ttl"/ { print $2 }' dig.out.3.${n}`
+test ${ttl:-0} -gt ${ttl2:-1} || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:check prefetch disabled (${n})"
+ret=0
+$DIG @10.53.0.7 -p 5300 fetch.example.net txt > dig.out.1.${n} || ret=1
+ttl1=`awk '/"A" "short" "ttl"/ { print $2 - 1 }' dig.out.1.${n}`
+# sleep so we are in expire range
+sleep ${ttl1:-0}
+# look for zero ttl, allow for one miss at getting zero ttl
+for i in 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9
+do 
+	$DIG @10.53.0.7 -p 5300 fetch.example.net txt > dig.out.2.${n} || ret=1
+	ttl2=`awk '/"A" "short" "ttl"/ { print $2 }' dig.out.2.${n}`
+	test ${ttl2:-1} -eq 0 && break
+	sleep 1
+done
+test ${ttl2:-1} -eq 0 || ret=1
+# delay so that any prefetched record will have a lower ttl than expected
+sleep 3
+# check that prefetch has not occured
+$DIG @10.53.0.7 -p 5300 fetch.example.net txt > dig.out.3.${n} || ret=1
+ttl=`awk '/"A" "short" "ttl"/ { print $2 - 1 }' dig.out.3.${n}`
+test ${ttl:-0} -eq ${ttl1:-1} || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
 
 echo "I:exit status: $status"
 exit $status