ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Handle dig timing out gracefully in keepalive

Browse Source 
(cherry picked from commit c6b267ce4d)
This commit is contained in:
Tom Krizek
2024-01-05 15:06:56 +01:00
parent f3840de0cb
commit b99fc82877
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/tests/system/keepalive/tests.sh
View File

@@ -23,7 +23,7 @@ status=0
echo_i "checking that dig handles TCP keepalive ($n)"
ret=0
n=$(expr $n + 1)
$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n
$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -39,7 +39,7 @@ status=$(expr $status + $ret)
echo_i "checking that TCP keepalive is added for TCP responses ($n)"
ret=0
n=$(expr $n + 1)
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -47,7 +47,7 @@ status=$(expr $status + $ret)
echo_i "checking that TCP keepalive requires TCP ($n)"
ret=0
n=$(expr $n + 1)
$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n
$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null && ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -55,7 +55,7 @@ status=$(expr $status + $ret)
echo_i "checking default value ($n)"
ret=0
n=$(expr $n + 1)
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 30.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -63,7 +63,7 @@ status=$(expr $status + $ret)
echo_i "checking configured value ($n)"
ret=0
n=$(expr $n + 1)
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 15.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -73,7 +73,7 @@ ret=0
n=$(expr $n + 1)
$RNDCCMD tcp-timeouts 300 300 300 200 >output
$DIFF -b output expected || ret=1
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$(expr $status + $ret)
@@ -84,7 +84,7 @@ n=$(expr $n + 1)
$RNDCCMD stats
oka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
| tail -1 | awk '{ print $1}')
$DIG $DIGOPTS bar.example @10.53.0.3 >dig.out.test$n
$DIG $DIGOPTS bar.example @10.53.0.3 >dig.out.test$n || ret=1
$RNDCCMD stats
nka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
| tail -1 | awk '{ print $1}')