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

4394. [func] Add rndc command "dnstap-reopen" to close and

Browse Source 
reopen dnstap output filed. [RT #41803]
This commit is contained in:
Mark Andrews
2016-06-24 09:37:04 +10:00
parent e8300d7263
commit 7d262a3647
19 changed files with 408 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
bin/tests/system/dnstap/tests.sh
View File

@@ -21,6 +21,18 @@ RNDCCMD="$RNDC -p 9953 -c ../common/rndc.conf"
status=0
$DIG +short @10.53.0.3 -p 5300 a.example > dig.out
mv ns1/dnstap.out ns1/dnstap.out.save
mv ns2/dnstap.out ns2/dnstap.out.save
mv ns3/dnstap.out ns3/dnstap.out.save
sleep 2
$RNDCCMD -s 10.53.0.1 dnstap-reopen | sed 's/^/I:ns1 /'
$RNDCCMD -s 10.53.0.2 dnstap-reopen | sed 's/^/I:ns2 /'
$RNDCCMD -s 10.53.0.3 dnstap-reopen | sed 's/^/I:ns3 /'
$DIG +short @10.53.0.3 -p 5300 a.example > dig.out
sleep 1
@@ -34,6 +46,146 @@ $RNDCCMD -s 10.53.0.2 stop | sed 's/^/I:ns2 /'
$RNDCCMD -s 10.53.0.3 stop | sed 's/^/I:ns3 /'
sleep 1
udp1=`$DNSTAPREAD ns1/dnstap.out.save | grep "UDP " | wc -l`
tcp1=`$DNSTAPREAD ns1/dnstap.out.save | grep "TCP " | wc -l`
aq1=`$DNSTAPREAD ns1/dnstap.out.save | grep "AQ " | wc -l`
ar1=`$DNSTAPREAD ns1/dnstap.out.save | grep "AR " | wc -l`
cq1=`$DNSTAPREAD ns1/dnstap.out.save | grep "CQ " | wc -l`
cr1=`$DNSTAPREAD ns1/dnstap.out.save | grep "CR " | wc -l`
rq1=`$DNSTAPREAD ns1/dnstap.out.save | grep "RQ " | wc -l`
rr1=`$DNSTAPREAD ns1/dnstap.out.save | grep "RR " | wc -l`
udp2=`$DNSTAPREAD ns2/dnstap.out.save | grep "UDP " | wc -l`
tcp2=`$DNSTAPREAD ns2/dnstap.out.save | grep "TCP " | wc -l`
aq2=`$DNSTAPREAD ns2/dnstap.out.save | grep "AQ " | wc -l`
ar2=`$DNSTAPREAD ns2/dnstap.out.save | grep "AR " | wc -l`
cq2=`$DNSTAPREAD ns2/dnstap.out.save | grep "CQ " | wc -l`
cr2=`$DNSTAPREAD ns2/dnstap.out.save | grep "CR " | wc -l`
rq2=`$DNSTAPREAD ns2/dnstap.out.save | grep "RQ " | wc -l`
rr2=`$DNSTAPREAD ns2/dnstap.out.save | grep "RR " | wc -l`
udp3=`$DNSTAPREAD ns3/dnstap.out.save | grep "UDP " | wc -l`
tcp3=`$DNSTAPREAD ns3/dnstap.out.save | grep "TCP " | wc -l`
aq3=`$DNSTAPREAD ns3/dnstap.out.save | grep "AQ " | wc -l`
ar3=`$DNSTAPREAD ns3/dnstap.out.save | grep "AR " | wc -l`
cq3=`$DNSTAPREAD ns3/dnstap.out.save | grep "CQ " | wc -l`
cr3=`$DNSTAPREAD ns3/dnstap.out.save | grep "CR " | wc -l`
rq3=`$DNSTAPREAD ns3/dnstap.out.save | grep "RQ " | wc -l`
rr3=`$DNSTAPREAD ns3/dnstap.out.save | grep "RR " | wc -l`
echo "I:checking initial message counts"
echo "I: checking UDP message counts"
ret=0
[ $udp1 -eq 0 ] || {
echo "ns1 $udp1 expected 0" ; ret=1
}
[ $udp2 -eq 2 ] || {
echo "ns2 $udp2 expected 2" ; ret=1
}
[ $udp3 -eq 4 ] || {
echo "ns3 $udp3 expected 4" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking TCP message counts"
ret=0
[ $tcp1 -eq 6 ] || {
echo "ns1 $tcp1 expected 6" ; ret=1
}
[ $tcp2 -eq 2 ] || {
echo "ns2 $tcp2 expected 2" ; ret=1
}
[ $tcp3 -eq 6 ] || {
echo "ns3 $tcp3 expected 6" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking AUTH_QUERY message counts"
ret=0
[ $aq1 -eq 2 ] || {
echo "ns1 $aq1 exepcted 2" ; ret=1
}
[ $aq2 -eq 1 ] || {
echo "ns2 $aq2 expected 1" ; ret=1
}
[ $aq3 -eq 0 ] || {
echo "ns3 $aq3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking AUTH_RESPONSE message counts"
ret=0
[ $ar1 -eq 2 ] || {
echo "ns1 $ar1 expected 2" ; ret=1
}
[ $ar2 -eq 1 ] || {
echo "ns2 $ar2 expected 1" ; ret=1
}
[ $ar3 -eq 0 ] || {
echo "ns3 $ar3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking CLIENT_QUERY message counts"
ret=0
[ $cq1 -eq 1 ] || {
echo "ns1 $cq1 expected 1" ; ret=1
}
[ $cq2 -eq 1 ] || {
echo "ns2 $cq2 expected 1" ; ret=1
}
[ $cq3 -eq 2 ] || {
echo "ns3 $cq3 expected 2" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking CLIENT_RESPONSE message counts"
ret=0
[ $cr1 -eq 1 ] || {
echo "ns1 $cr1 expected 1" ; ret=1
}
[ $cr2 -eq 1 ] || {
echo "ns2 $cr2 expected 1" ; ret=1
}
[ $cr3 -eq 2 ] || {
echo "ns3 $cr3 expected 2" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking RESOLVER_QUERY message counts"
ret=0
[ $rq1 -eq 0 ] || {
echo "ns1 $rq1 expected 0" ; ret=1
}
[ $rq2 -eq 0 ] || {
echo "ns2 $rq2 expected 0" ; ret=1
}
[ $rq3 -eq 3 ] || {
echo "ns3 $rq3 expected 3" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I: checking RESOLVER_RESPONSE message counts"
ret=0
[ $rr1 -eq 0 ] || {
echo "ns1 $rr1 expected 0" ; ret=1
}
[ $rr2 -eq 0 ] || {
echo "ns2 $rr2 expected 0" ; ret=1
}
[ $rr3 -eq 3 ] || {
echo "ns3 $rr3 expected 3" ; ret=1
}
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
udp1=`$DNSTAPREAD ns1/dnstap.out | grep "UDP " | wc -l`
tcp1=`$DNSTAPREAD ns1/dnstap.out | grep "TCP " | wc -l`
aq1=`$DNSTAPREAD ns1/dnstap.out | grep "AQ " | wc -l`
@@ -61,91 +213,93 @@ cr3=`$DNSTAPREAD ns3/dnstap.out | grep "CR " | wc -l`
rq3=`$DNSTAPREAD ns3/dnstap.out | grep "RQ " | wc -l`
rr3=`$DNSTAPREAD ns3/dnstap.out | grep "RR " | wc -l`
echo "I:checking UDP message counts"
echo "I:checking reopened message counts"
echo "I: checking UDP message counts"
ret=0
[ $udp1 -eq 0 ] || {
echo "ns1 $udp1 expected 0" ; ret=1
}
[ $udp2 -eq 2 ] || {
echo "ns2 $udp2 expected 2" ; ret=1
[ $udp2 -eq 0 ] || {
echo "ns2 $udp2 expected 0" ; ret=1
}
[ $udp3 -eq 4 ] || {
echo "ns3 $udp3 expected 4" ; ret=1
[ $udp3 -eq 2 ] || {
echo "ns3 $udp3 expected 2" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking TCP message counts"
echo "I: checking TCP message counts"
ret=0
[ $tcp1 -eq 6 ] || {
echo "ns1 $tcp1 expected 6" ; ret=1
[ $tcp1 -eq 0 ] || {
echo "ns1 $tcp1 expected 0" ; ret=1
}
[ $tcp2 -eq 2 ] || {
echo "ns2 $tcp2 expected 2" ; ret=1
[ $tcp2 -eq 0 ] || {
echo "ns2 $tcp2 expected 0" ; ret=1
}
[ $tcp3 -eq 6 ] || {
echo "ns3 $tcp3 expected 6" ; ret=1
[ $tcp3 -eq 0 ] || {
echo "ns3 $tcp3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking AUTH_QUERY message counts"
echo "I: checking AUTH_QUERY message counts"
ret=0
[ $aq1 -eq 2 ] || {
echo "ns1 $aq1 exepcted 2" ; ret=1
[ $aq1 -eq 0 ] || {
echo "ns1 $aq1 exepcted 0" ; ret=1
}
[ $aq2 -eq 1 ] || {
echo "ns2 $aq2 expected 1" ; ret=1
[ $aq2 -eq 0 ] || {
echo "ns2 $aq2 expected 0" ; ret=1
}
[ $aq3 -eq 0 ] || {
echo "ns3 $aq3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking AUTH_RESPONSE message counts"
echo "I: checking AUTH_RESPONSE message counts"
ret=0
[ $ar1 -eq 2 ] || {
echo "ns1 $ar1 expected 2" ; ret=1
[ $ar1 -eq 0 ] || {
echo "ns1 $ar1 expected 0" ; ret=1
}
[ $ar2 -eq 1 ] || {
echo "ns2 $ar2 expected 1" ; ret=1
[ $ar2 -eq 0 ] || {
echo "ns2 $ar2 expected 0" ; ret=1
}
[ $ar3 -eq 0 ] || {
echo "ns3 $ar3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking CLIENT_QUERY message counts"
echo "I: checking CLIENT_QUERY message counts"
ret=0
[ $cq1 -eq 1 ] || {
echo "ns1 $cq1 expected 1" ; ret=1
[ $cq1 -eq 0 ] || {
echo "ns1 $cq1 expected 0" ; ret=1
}
[ $cq2 -eq 1 ] || {
echo "ns2 $cq2 expected 1" ; ret=1
[ $cq2 -eq 0 ] || {
echo "ns2 $cq2 expected 0" ; ret=1
}
[ $cq3 -eq 2 ] || {
echo "ns3 $cq3 expected 2" ; ret=1
[ $cq3 -eq 1 ] || {
echo "ns3 $cq3 expected 1" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking CLIENT_RESPONSE message counts"
echo "I: checking CLIENT_RESPONSE message counts"
ret=0
[ $cr1 -eq 1 ] || {
echo "ns1 $cr1 expected 1" ; ret=1
[ $cr1 -eq 0 ] || {
echo "ns1 $cr1 expected 0" ; ret=1
}
[ $cr2 -eq 1 ] || {
echo "ns2 $cr2 expected 1" ; ret=1
[ $cr2 -eq 0 ] || {
echo "ns2 $cr2 expected 0" ; ret=1
}
[ $cr3 -eq 2 ] || {
echo "ns3 $cr3 expected 2" ; ret=1
[ $cr3 -eq 1 ] || {
echo "ns3 $cr3 expected 1" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking RESOLVER_QUERY message counts"
echo "I: checking RESOLVER_QUERY message counts"
ret=0
[ $rq1 -eq 0 ] || {
echo "ns1 $rq1 expected 0" ; ret=1
@@ -153,13 +307,13 @@ ret=0
[ $rq2 -eq 0 ] || {
echo "ns2 $rq2 expected 0" ; ret=1
}
[ $rq3 -eq 3 ] || {
echo "ns3 $rq3 expected 3" ; ret=1
[ $rq3 -eq 0 ] || {
echo "ns3 $rq3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:checking RESOLVER_RESPONSE message counts"
echo "I: checking RESOLVER_RESPONSE message counts"
ret=0
[ $rr1 -eq 0 ] || {
echo "ns1 $rr1 expected 0" ; ret=1
@@ -167,10 +321,10 @@ ret=0
[ $rr2 -eq 0 ] || {
echo "ns2 $rr2 expected 0" ; ret=1
}
[ $rr3 -eq 3 ] || {
echo "ns3 $rr3 expected 3" ; ret=1
[ $rr3 -eq 0 ] || {
echo "ns3 $rr3 expected 0" ; ret=1
}
if [ $ret != 0 ]; then echo "I:failed"; fi
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"