24510a1fda
With the netmgr in use, named may start answering queries before zones are loaded. This can cause transient failures in system tests after servers are restarted or reconfigured. This commit adds retry loops and sleep statements where needed to address this problem. Also incidentally silenced a clang warning.
78 lines
2.4 KiB
Bash
78 lines
2.4 KiB
Bash
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
# See the COPYRIGHT file distributed with this work for additional
|
|
# information regarding copyright ownership.
|
|
|
|
SYSTEMTESTTOP=..
|
|
. $SYSTEMTESTTOP/conf.sh
|
|
|
|
DIGOPTS="-p ${PORT}"
|
|
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
|
|
|
|
status=0
|
|
n=0
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "querying for non-existing zone data ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
|
|
grep 'status: REFUSED' dig.out.ns1.$n > /dev/null || ret=1
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=`expr $status + $ret`
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "adding a new zone into default NZD using rndc addzone ($n)"
|
|
$RNDCCMD 10.53.0.1 addzone "added.example { type master; file \"added.db\";
|
|
};" 2>&1 | sed 's/^/I:ns1 /' | cat_i
|
|
sleep 2
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "querying for existing zone data ($n)"
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
|
|
grep 'status: NOERROR' dig.out.ns1.$n > /dev/null || ret=1
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=`expr $status + $ret`
|
|
|
|
echo_i "stopping ns1"
|
|
$PERL $SYSTEMTESTTOP/stop.pl nzd2nzf ns1
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "dumping _default.nzd to _default.nzf ($n)"
|
|
$NZD2NZF ns1/_default.nzd > ns1/_default.nzf || ret=1
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=`expr $status + $ret`
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "checking that _default.nzf contains the expected content ($n)"
|
|
grep 'zone "added.example" { type master; file "added.db"; };' ns1/_default.nzf > /dev/null || ret=1
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=`expr $status + $ret`
|
|
|
|
echo_i "deleting _default.nzd database"
|
|
rm -f ns1/_default.nzd
|
|
|
|
echo_i "starting ns1 which should migrate the .nzf to .nzd"
|
|
$PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} nzd2nzf ns1
|
|
|
|
n=`expr $n + 1`
|
|
echo_i "querying for zone data from migrated zone config ($n)"
|
|
# retry loop in case the server restart above causes transient failures
|
|
for try in 0 1 2 3 4 5 6 7 8 9; do
|
|
ret=0
|
|
$DIG $DIGOPTS @10.53.0.1 a.added.example a > dig.out.ns1.$n || ret=1
|
|
grep 'status: NOERROR' dig.out.ns1.$n > /dev/null || ret=1
|
|
[ "$ret" -eq 0 ] && break
|
|
sleep 1
|
|
done
|
|
n=`expr $n + 1`
|
|
if [ $ret != 0 ]; then echo_i "failed"; fi
|
|
status=`expr $status + $ret`
|
|
|
|
echo_i "exit status: $status"
|
|
exit $status
|