mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

Handle dig timing out gracefully in keepalive

Browse Source
This commit is contained in:
Tom Krizek
2024-01-05 15:06:56 +01:00
parent fcce010045
commit c6b267ce4d
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

@@ -24,7 +24,7 @@ status=0
echo_i "checking that dig handles TCP keepalive ($n)" echo_i "checking that dig handles TCP keepalive ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((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 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -40,7 +40,7 @@ status=$((status + ret))
echo_i "checking that TCP keepalive is added for TCP responses ($n)" echo_i "checking that TCP keepalive is added for TCP responses ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((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 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -48,7 +48,7 @@ status=$((status + ret))
echo_i "checking that TCP keepalive requires TCP ($n)" echo_i "checking that TCP keepalive requires TCP ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((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 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null && ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -56,7 +56,7 @@ status=$((status + ret))
echo_i "checking default value ($n)" echo_i "checking default value ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((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 grep "; TCP KEEPALIVE: 30.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -64,7 +64,7 @@ status=$((status + ret))
echo_i "checking configured value ($n)" echo_i "checking configured value ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((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 grep "; TCP KEEPALIVE: 15.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -74,7 +74,7 @@ ret=0
n=$((n + 1)) n=$((n + 1))
$RNDCCMD tcp-timeouts 300 300 300 200 >output $RNDCCMD tcp-timeouts 300 300 300 200 >output
diff -b output expected || ret=1 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 grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -85,7 +85,7 @@ n=$((n + 1))
$RNDCCMD stats $RNDCCMD stats
oka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \ oka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
| tail -1 | awk '{ print $1}') | 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 $RNDCCMD stats
nka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \ nka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
| tail -1 | awk '{ print $1}') | tail -1 | awk '{ print $1}')