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

improve reliability of the xfer test on slow systems

Browse Source 
- lengthed the wait loop for the transfers to complete
This commit is contained in:
Evan Hunt
2018-02-22 18:34:16 -08:00
parent 474b10a133
commit b9246ce773
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
bin/tests/system/xfer/tests.sh
View File

@@ -37,9 +37,9 @@ done
if test $tmp -eq 1 ; then status=1; fi if test $tmp -eq 1 ; then status=1; fi
grep "^;" dig.out.ns3 | cat_i grep "^;" dig.out.ns3 | cat_i
$PERL ../digcomp.pl dig1.good dig.out.ns2 || status=1 { $PERL ../digcomp.pl dig1.good dig.out.ns2 || status=1; } | cat_i
$PERL ../digcomp.pl dig1.good dig.out.ns3 || status=1 { $PERL ../digcomp.pl dig1.good dig.out.ns3 || status=1; } | cat_i
n=`expr $n + 1` n=`expr $n + 1`
echo_i "testing TSIG signed zone transfers" echo_i "testing TSIG signed zone transfers"
@@ -61,7 +61,7 @@ done
if test $tmp -eq 1 ; then status=1; fi if test $tmp -eq 1 ; then status=1; fi
grep "^;" dig.out.ns3 | cat_i grep "^;" dig.out.ns3 | cat_i
$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1 { $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1; } | cat_i
echo_i "reload servers for in preparation for ixfr-from-differences tests" echo_i "reload servers for in preparation for ixfr-from-differences tests"
@@ -116,18 +116,25 @@ status=`expr $status + $tmp`
n=`expr $n + 1` n=`expr $n + 1`
echo_i "testing ixfr-from-differences yes;" echo_i "testing ixfr-from-differences yes;"
tmp=0 tmp=0
for i in 0 1 2 3 4 5 6 7 8 9 for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
do do
$DIG $DIGOPTS @10.53.0.3 +noall +answer soa example > dig.out.soa.ns3 a=0 b=0 c=0 d=0
grep "1397051953" dig.out.soa.ns3 > /dev/null && break; echo_i "wait for transfers..."
sleep 1 $DIG $DIGOPTS @10.53.0.3 +noall +answer soa example > dig.out.soa1.ns3
grep "1397051953" dig.out.soa1.ns3 > /dev/null && a=1
$DIG $DIGOPTS @10.53.0.3 +noall +answer soa master > dig.out.soa2.ns3
grep "1397051953" dig.out.soa2.ns3 > /dev/null && b=1
$DIG $DIGOPTS @10.53.0.6 +noall +answer soa slave > dig.out.soa3.ns3
grep "1397051953" dig.out.soa3.ns3 > /dev/null && c=1
[ $a -eq 1 -a $b -eq 1 -a $c -eq 1 ] && break
sleep 2
done done
$DIG $DIGOPTS example. \ $DIG $DIGOPTS example. \
@10.53.0.3 axfr > dig.out.ns3 || tmp=1 @10.53.0.3 axfr > dig.out.ns3 || tmp=1
grep "^;" dig.out.ns3 | cat_i grep "^;" dig.out.ns3 | cat_i
$PERL ../digcomp.pl dig2.good dig.out.ns3 || tmp=1 { $PERL ../digcomp.pl dig2.good dig.out.ns3 || tmp=1; } | cat_i
# ns3 has a journal iff it received an IXFR. # ns3 has a journal iff it received an IXFR.
test -f ns3/example.bk || tmp=1 test -f ns3/example.bk || tmp=1
@@ -148,7 +155,7 @@ $DIG $DIGOPTS master. \
@10.53.0.3 axfr > dig.out.ns3 || tmp=1 @10.53.0.3 axfr > dig.out.ns3 || tmp=1
grep "^;" dig.out.ns3 > /dev/null && cat_i dig.out.ns3 grep "^;" dig.out.ns3 > /dev/null && cat_i dig.out.ns3
$PERL ../digcomp.pl dig.out.ns6 dig.out.ns3 || tmp=1 { $PERL ../digcomp.pl dig.out.ns6 dig.out.ns3 || tmp=1; } | cat_i
# ns3 has a journal iff it received an IXFR. # ns3 has a journal iff it received an IXFR.
test -f ns3/master.bk || tmp=1 test -f ns3/master.bk || tmp=1
@@ -169,7 +176,7 @@ $DIG $DIGOPTS slave. \
@10.53.0.1 axfr > dig.out.ns1 || tmp=1 @10.53.0.1 axfr > dig.out.ns1 || tmp=1
grep "^;" dig.out.ns1 | cat_i grep "^;" dig.out.ns1 | cat_i
$PERL ../digcomp.pl dig.out.ns6 dig.out.ns1 || tmp=1 { $PERL ../digcomp.pl dig.out.ns6 dig.out.ns1 || tmp=1; } | cat_i
# ns6 has a journal iff it received an IXFR. # ns6 has a journal iff it received an IXFR.
test -f ns6/slave.bk || tmp=1 test -f ns6/slave.bk || tmp=1
@@ -201,7 +208,7 @@ $DIG $DIGOPTS slave. \
@10.53.0.7 axfr > dig.out.ns7 || tmp=1 @10.53.0.7 axfr > dig.out.ns7 || tmp=1
grep "^;" dig.out.ns1 | cat_i grep "^;" dig.out.ns1 | cat_i
$PERL ../digcomp.pl dig.out.ns7 dig.out.ns1 || tmp=1 { $PERL ../digcomp.pl dig.out.ns7 dig.out.ns1 || tmp=1; } | cat_i
# ns7 has a journal iff it generates an IXFR. # ns7 has a journal iff it generates an IXFR.
test -f ns7/slave.bk || tmp=1 test -f ns7/slave.bk || tmp=1
@@ -404,7 +411,7 @@ $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns3
$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.$n $DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.$n
grep "status: NOERROR," dig.out.2.$n > /dev/null || tmp=1 grep "status: NOERROR," dig.out.2.$n > /dev/null || tmp=1
$DIG -p ${PORT} axfr mapped @10.53.0.3 > dig.out.3.$n $DIG -p ${PORT} axfr mapped @10.53.0.3 > dig.out.3.$n
$PERL ../digcomp.pl knowngood.mapped dig.out.3.$n || tmp=1 { $PERL ../digcomp.pl knowngood.mapped dig.out.3.$n || tmp=1; } | cat_i
if test $tmp != 0 ; then echo_i "failed"; fi if test $tmp != 0 ; then echo_i "failed"; fi
status=`expr $status + $tmp` status=`expr $status + $tmp`