mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch '3902-fetchlimit-system-test-failed' into 'main'

Browse Source 
Resolve "'fetchlimit' system test failed"

Closes #3902

See merge request isc-projects/bind9!7615
This commit is contained in:
Mark Andrews
2023-02-28 07:23:00 +00:00
parent 19cffc4972 c7ae975ecf
commit cdbdb5fcec
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tests/system/fetchlimit/clean.sh
View File

@@ -12,8 +12,8 @@
# information regarding copyright ownership. # information regarding copyright ownership.
rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run rm -f */named.conf */named.memstats */ans.run */named.recursing */named.run
rm -f dig.out*
rm -f ans4/norespond rm -f ans4/norespond
rm -f ns3/named.stats ns3/named_dump.db
rm -f burst.input.* rm -f burst.input.*
rm -f dig.out*
rm -f ns*/managed-keys.bind* rm -f ns*/managed-keys.bind*
rm -f ns3/named.stats ns3/named.stats.prev ns3/named_dump.db

8
bin/tests/system/fetchlimit/tests.sh
View File

@@ -165,7 +165,7 @@ touch ans4/norespond
for try in 1 2 3 4 5; do for try in 1 2 3 4 5; do
burst b $try 400 burst b $try 400
$DIGCMD +time=2 a ${try}.example > dig.out.ns3.$try $DIGCMD +time=2 a ${try}.example > dig.out.ns3.$try
stat 100 400 || exceeded=$((exceeded + 1)) stat 1 400 || exceeded=$((exceeded + 1))
grep "status: NOERROR" dig.out.ns3.$try > /dev/null 2>&1 && \ grep "status: NOERROR" dig.out.ns3.$try > /dev/null 2>&1 && \
success=$((success+1)) success=$((success+1))
grep "status: SERVFAIL" dig.out.ns3.$try > /dev/null 2>&1 && \ grep "status: SERVFAIL" dig.out.ns3.$try > /dev/null 2>&1 && \
@@ -183,11 +183,9 @@ status=$((status+ret))
echo_i "checking drop statistics" echo_i "checking drop statistics"
rm -f ns3/named.stats rm -f ns3/named.stats
touch ns3/named.stats
$RNDCCMD stats $RNDCCMD stats
for try in 1 2 3 4 5; do wait_for_log 5 "queries dropped due to recursive client limit" ns3/named.stats || ret=1
[ -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=`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 [ "${drops:-0}" -ne 0 ] || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi