Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/bin/tests/system/fetchlimit/tests.sh,v rcsdiff: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/bin/tests/system/fetchlimit/tests.sh,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.4 diff -u -p -r1.1.1.3.2.2 -r1.1.1.4 --- src/external/mpl/bind/dist/bin/tests/system/fetchlimit/tests.sh 2019/06/10 22:03:31 1.1.1.3.2.2 +++ src/external/mpl/bind/dist/bin/tests/system/fetchlimit/tests.sh 2020/05/24 19:36:33 1.1.1.4 @@ -154,7 +154,7 @@ status=`expr $status + $ret` copy_setports ns3/named3.conf.in ns3/named.conf rndc_reconfig ns3 10.53.0.3 -echo_i "checking lame server clients are dropped near the soft limit" +echo_i "checking lame server clients are dropped below the hard limit" ret=0 fail=0 exceeded=0 @@ -163,7 +163,7 @@ touch ans4/norespond for try in 1 2 3 4 5; do burst b $try 400 $DIGCMD a ${try}.example > dig.out.ns3.$try - stat 380 || exceeded=`expr $exceeded + 1` + stat 400 || exceeded=`expr $exceeded + 1` grep "status: NOERROR" dig.out.ns3.$try > /dev/null 2>&1 && \ success=`expr $success + 1` grep "status: SERVFAIL" dig.out.ns3.$try > /dev/null 2>&1 && \ @@ -174,10 +174,22 @@ echo_i "$success successful valid querie [ "$success" -eq 5 ] || { echo_i "failed"; ret=1; } echo_i "$fail SERVFAIL responses (expected 0)" [ "$fail" -eq 0 ] || { echo_i "failed"; ret=1; } -echo_i "clients count exceeded 380 on $exceeded trials (expected 0)" +echo_i "clients count exceeded 400 on $exceeded trials (expected 0)" [ "$exceeded" -eq 0 ] || { echo_i "failed"; ret=1; } if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` +echo_i "checking drop statistics" +rm -f ns3/named.stats +$RNDCCMD stats +for try in 1 2 3 4 5; do + [ -f ns3/named.stats ] && break + sleep 1 +done +drops=`grep 'queries dropped due to recursive client limit' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.*/\1/'` +[ "${drops:-0}" -ne 0 ] || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=`expr $status + $ret` + echo_i "exit status: $status" [ $status -eq 0 ] || exit 1