Commit 370a335d authored by Ondřej Surý's avatar Ondřej Surý

Rename start() and stop() to start_server() and stop_server()

On OpenBSD, there's non-POSIX alias from stop to kill that breaks
the conf.sh.common script.
parent 5b7fccd2
Pipeline #40703 canceled with stages
in 1 second
......@@ -722,8 +722,8 @@ $RNDCCMD 10.53.0.3 addzone '"test\".baz"' '{ type master; check-names ignore; fi
$RNDCCMD 10.53.0.3 addzone '"test\\.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\032.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone '"test\010.baz"' '{ type master; check-names ignore; file "e.db"; };' > /dev/null 2>&1 || ret=1
stop addzone ns3
start --noclean --restart --port ${PORT} addzone ns3 || ret=1
stop_server addzone ns3
start_server --noclean --restart --port ${PORT} addzone ns3 || ret=1
retry_quiet 10 _check_version_bind || ret=1
$DIG $DIGOPTS @10.53.0.3 SOA "test4.baz" > dig.out.1.test$n || ret=1
grep "status: NOERROR" dig.out.1.test$n > /dev/null || ret=1
......
......@@ -192,11 +192,11 @@ digcomp() {
return $result
}
start() {
start_server() {
$PERL "$TOP_SRCDIR/bin/tests/system/start.pl" "$@"
}
stop() {
stop_server() {
$PERL "$TOP_SRCDIR/bin/tests/system/stop.pl" "$@"
}
......
......@@ -2057,7 +2057,7 @@ echo_i "waiting till 14s have passed since NTAs were added before restarting ns4
$PERL -e 'my $delay = '"$start"' + 14 - time(); select(undef, undef, undef, $delay) if ($delay > 0);'
if
start --noclean --restart --port "$PORT" dnssec ns4
start_server --noclean --restart_server --port "$PORT" dnssec ns4
then
echo_i "restarted server ns4"
else
......@@ -2123,7 +2123,7 @@ echo "secure.example. regular $future" > ns4/_default.nta
start=$($PERL -e 'print time()."\n";')
if
start --noclean --restart --port "$PORT" dnssec ns4
start_server --noclean --restart_server --port "$PORT" dnssec ns4
then
echo_i "restarted server ns4"
else
......@@ -2179,7 +2179,7 @@ echo "secure.example. forced $future" > ns4/_default.nta
start=$($PERL -e 'print time()."\n";')
if
start --noclean --restart --port "$PORT" dnssec ns4
start_server --noclean --restart_server --port "$PORT" dnssec ns4
then
echo_i "restarted server ns4"
else
......@@ -2227,7 +2227,7 @@ echo "secure.example. forced $future" > ns4/_default.nta
added=$($PERL -e 'print time()."\n";')
if
start --noclean --restart --port "$PORT" dnssec ns4
start_server --noclean --restart_server --port "$PORT" dnssec ns4
then
echo_i "restarted server ns4"
else
......@@ -3789,7 +3789,7 @@ grep "trust-anchor-telemetry './IN' from .* 65534" ns1/named.run > /dev/null ||
grep "trust-anchor-telemetry './IN' from .* 65533" ns1/named.run > /dev/null && ret=1
$PERL $SYSTEMTESTTOP/stop.pl dnssec ns1 || ret=1
nextpart ns1/named.run > /dev/null
start --noclean --restart --port ${PORT} dnssec ns1 || ret=1
start_server --noclean --restart_server --port ${PORT} dnssec ns1 || ret=1
n=$(($n+1))
test "$ret" -eq 0 || echo_i "failed"
status=$((status+ret))
......
......@@ -104,10 +104,10 @@ echo_i "checking for negative caching of forwarder response ($n)"
ret=0
dig_with_opts nonexist. txt @10.53.0.5 > dig.out.$n.f2 || ret=1
grep "status: NXDOMAIN" dig.out.$n.f2 > /dev/null || ret=1
stop forward ns4 || ret=1
stop_server forward ns4 || ret=1
dig_with_opts nonexist. txt @10.53.0.5 > dig.out.$n.f2 || ret=1
grep "status: NXDOMAIN" dig.out.$n.f2 > /dev/null || ret=1
start --restart --noclean --port "${PORT}" forward ns4 || ret=1
start_server --restart --noclean --port "${PORT}" forward ns4 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
......
......@@ -468,14 +468,14 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "stop bump in the wire signer server ($n)"
ret=0
stop inline ns3 || ret=1
stop_server inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "restart bump in the wire signer server ($n)"
ret=0
start --noclean --restart --port ${PORT} inline ns3 || ret=1
start_server --noclean --restart --port ${PORT} inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
......@@ -882,7 +882,7 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "stop bump in the wire signer server ($n)"
ret=0
stop inline ns3 || ret=1
stop_server inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
......@@ -893,7 +893,7 @@ rm ns3/master.db.jnl
n=`expr $n + 1`
echo_i "restart bump in the wire signer server ($n)"
ret=0
start --noclean --restart --port ${PORT} inline ns3 || ret=1
start_server --noclean --restart --port ${PORT} inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
......@@ -1342,7 +1342,7 @@ retry_quiet 10 check_done_signing || ret=1
# flushed upon shutdown since we specifically want to avoid it.
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed
start --noclean --restart --port ${PORT} inline ns3
start_server --noclean --restart --port ${PORT} inline ns3
# At this point, the raw zone journal will not have a source serial set. Upon
# server startup, receive_secure_serial() will rectify that, update SOA, resign
# it, and schedule its future resign. This will cause "rndc zonestatus" to
......@@ -1352,7 +1352,7 @@ start --noclean --restart --port ${PORT} inline ns3
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} inline ns3
start_server --noclean --restart --port ${PORT} inline ns3
# We can now test whether the secure zone journal was correctly processed:
# unless the records contained in it were scheduled for resigning, no resigning
# event will be scheduled at all since the secure zone master file contains no
......
......@@ -254,7 +254,7 @@ status=`expr $status + $ret`
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} legacy ns1
copy_setports ns1/named2.conf.in ns1/named.conf
start --noclean --restart --port ${PORT} legacy ns1
start_server --noclean --restart --port ${PORT} legacy ns1
n=`expr $n + 1`
echo_i "checking recursive lookup to edns 512 + no tcp + trust anchor fails ($n)"
......
......@@ -80,7 +80,7 @@ stomp () {
restart () {
sleep 1
start --noclean --restart --port "${PORT}" masterformat ns3
start_server --noclean --restart_server --port "${PORT}" masterformat ns3
}
dig_with_opts() {
......
......@@ -223,10 +223,10 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "checking that loading a correctly signed mirror zone from disk succeeds ($n)"
ret=0
stop --use-rndc --port ${CONTROLPORT} mirror ns3
stop_server --use-rndc --port ${CONTROLPORT} mirror ns3
cat ns2/verify-load.db.good.signed > ns3/verify-load.db.mirror
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} mirror ns3
start_server --noclean --restart --port ${PORT} mirror ns3
wait_for_load verify-load ${UPDATED_SERIAL_GOOD} ns3/named.run
$DIG $DIGOPTS @10.53.0.3 +norec verify-load SOA > dig.out.ns3.test$n 2>&1 || ret=1
grep "ANSWER: 0" dig.out.ns3.test$n > /dev/null && ret=1
......@@ -238,7 +238,7 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "checking that loading a journal for an incorrectly signed mirror zone fails ($n)"
ret=0
stop --use-rndc --port ${CONTROLPORT} mirror ns3
stop_server --use-rndc --port ${CONTROLPORT} mirror ns3
cp ns3/verify-journal.db.mirror ns3/verify-ixfr.db.mirror
cp ns3/verify-journal.db.bad.mirror.jnl ns3/verify-ixfr.db.mirror.jnl
# Temporarily disable transfers of the "verify-ixfr" zone on ns2. This is
......@@ -253,7 +253,7 @@ sed '/^zone "verify-ixfr" {$/,/^};$/ {
mv ns2/named.conf.modified ns2/named.conf
rndc_reconfig ns2 10.53.0.2
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} mirror ns3
start_server --noclean --restart --port ${PORT} mirror ns3
wait_for_load verify-ixfr ${UPDATED_SERIAL_BAD} ns3/named.run
$DIG $DIGOPTS @10.53.0.3 +norec verify-ixfr SOA > dig.out.ns3.test$n 2>&1 || ret=1
grep "ANSWER: 0" dig.out.ns3.test$n > /dev/null || ret=1
......@@ -273,11 +273,11 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "checking that loading a journal for a correctly signed mirror zone succeeds ($n)"
ret=0
stop --use-rndc --port ${CONTROLPORT} mirror ns3
stop_server --use-rndc --port ${CONTROLPORT} mirror ns3
cp ns3/verify-journal.db.mirror ns3/verify-ixfr.db.mirror
cp ns3/verify-journal.db.good.mirror.jnl ns3/verify-ixfr.db.mirror.jnl
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} mirror ns3
start_server --noclean --restart --port ${PORT} mirror ns3
wait_for_load verify-ixfr ${UPDATED_SERIAL_GOOD} ns3/named.run
$DIG $DIGOPTS @10.53.0.3 +norec verify-ixfr SOA > dig.out.ns3.test$n 2>&1 || ret=1
grep "ANSWER: 0" dig.out.ns3.test$n > /dev/null && ret=1
......@@ -415,10 +415,10 @@ mv ns2/named.conf.modified ns2/named.conf
rndc_reconfig ns2 10.53.0.2
# Stop ns3, update the timestamp of the zone file to one far in the past, then
# restart ns3.
stop --use-rndc --port ${CONTROLPORT} mirror ns3
stop_server --use-rndc --port ${CONTROLPORT} mirror ns3
touch -t 200001010000 ns3/initially-unavailable.db.mirror
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} mirror ns3
start_server --noclean --restart --port ${PORT} mirror ns3
# Ensure named attempts to retransfer the zone due to its expiry.
wait_for_transfer initially-unavailable
# Ensure the expected messages were logged.
......
......@@ -298,11 +298,11 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
echo_i "reinitialize trust anchors, add second key to bind.keys"
stop --use-rndc --port "${CONTROLPORT}" mkeys ns2
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns2
rm -f ns2/managed-keys.bind*
keyfile_to_initial_ds ns1/"$original" ns1/"$standby1" > ns2/managed.conf
nextpart ns2/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns2
start_server --noclean --restart --port "${PORT}" mkeys ns2
n=$((n+1))
echo_i "check that no key from bind.keys is marked as an initializing key ($n)"
......@@ -314,11 +314,11 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
echo_i "reinitialize trust anchors, revert to one key in bind.keys"
stop --use-rndc --port "${CONTROLPORT}" mkeys ns2
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns2
rm -f ns2/managed-keys.bind*
mv ns2/managed1.conf ns2/managed.conf
nextpart ns2/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns2
start_server --noclean --restart --port "${PORT}" mkeys ns2
n=$((n+1))
echo_i "check that standby key is now trusted ($n)"
......@@ -472,10 +472,10 @@ rm -f ns1/root.db.signed.jnl
mkeys_reconfig_on 1 || ret=1
echo_i "reinitialize trust anchors"
stop --use-rndc --port "${CONTROLPORT}" mkeys ns2
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns2
rm -f ns2/managed-keys.bind*
nextpart ns2/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns2
start_server --noclean --restart --port "${PORT}" mkeys ns2
n=$((n+1))
echo_i "check positive validation ($n)"
......@@ -571,11 +571,11 @@ ret=0
mkeys_refresh_on 2 || ret=1
mkeys_status_on 2 > rndc.out.1.$n 2>&1 || ret=1
t1=$(grep 'next refresh:' rndc.out.1.$n) || true
stop --use-rndc --port "${CONTROLPORT}" mkeys ns1
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns1
rm -f ns1/root.db.signed.jnl
cp ns1/root.db ns1/root.db.signed
nextpart ns1/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns1
start_server --noclean --restart --port "${PORT}" mkeys ns1
wait_for_log 20 "all zones loaded" ns1/named.run || ret=1
mkeys_refresh_on 2 || ret=1
mkeys_status_on 2 > rndc.out.2.$n 2>&1 || ret=1
......@@ -605,11 +605,11 @@ ret=0
mkeys_refresh_on 2 || ret=1
mkeys_status_on 2 > rndc.out.1.$n 2>&1 || ret=1
t1=$(grep 'next refresh:' rndc.out.1.$n) || true
stop --use-rndc --port "${CONTROLPORT}" mkeys ns1
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns1
rm -f ns1/root.db.signed.jnl
cat ns1/K*.key >> ns1/root.db.signed
nextpart ns1/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns1
start_server --noclean --restart --port "${PORT}" mkeys ns1
wait_for_log 20 "all zones loaded" ns1/named.run || ret=1
# Less than a second may have passed since the last time ns2 received a
# ./DNSKEY response from ns1. Ensure keys are refreshed at a different
......@@ -707,9 +707,9 @@ ret=0
# ensure key refresh retry will be scheduled to one actual hour after the first
# key refresh failure instead of just a few seconds, in order to prevent races
# between the next scheduled key refresh time and startup time of restarted ns5.
stop --use-rndc --port "${CONTROLPORT}" mkeys ns5
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns5
nextpart ns5/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns5
start_server --noclean --restart --port "${PORT}" mkeys ns5
wait_for_log 20 "Returned from key fetch in keyfetch_done()" ns5/named.run || ret=1
# ns5/named.run will contain logs from both the old instance and the new
# instance. In order for the test to pass, both must attempt a fetch.
......@@ -721,14 +721,14 @@ status=$((status+ret))
n=$((n+1))
echo_i "check key refreshes are resumed after root servers become available ($n)"
ret=0
stop --use-rndc --port "${CONTROLPORT}" mkeys ns5
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns5
# Prevent previous check from affecting this one
rm -f ns5/managed-keys.bind*
# named2.args adds "-T mkeytimers=2/20/40" to named1.args as we need to wait for
# an "hour" until keys are refreshed again after initial failure
cp ns5/named2.args ns5/named.args
nextpart ns5/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns5
start_server --noclean --restart --port "${PORT}" mkeys ns5
wait_for_log 20 "Returned from key fetch in keyfetch_done() for '.': failure" ns5/named.run || ret=1
mkeys_secroots_on 5 || ret=1
grep '; initializing managed' ns5/named.secroots > /dev/null 2>&1 || ret=1
......@@ -757,10 +757,10 @@ status=$((status+ret))
n=$((n+1))
echo_i "reinitialize trust anchors, add unsupported algorithm ($n)"
ret=0
stop --use-rndc --port "${CONTROLPORT}" mkeys ns6
stop_server --use-rndc --port "${CONTROLPORT}" mkeys ns6
rm -f ns6/managed-keys.bind*
nextpart ns6/named.run > /dev/null
start --noclean --restart --port "${PORT}" mkeys ns6
start_server --noclean --restart --port "${PORT}" mkeys ns6
# log when an unsupported algorithm is encountered during startup
wait_for_log 20 "ignoring initial-key for 'unsupported.': algorithm is unsupported" ns6/named.run || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
......
......@@ -140,12 +140,12 @@ digcomp dig.out.ns2.test$n dig.out.ns3.test$n || ret=1
status=`expr $ret + $status`
echo_i "stopping master and restarting with example4 then waiting up to 45 seconds"
stop notify ns2
stop_server notify ns2
rm -f ns2/example.db
cp -f ns2/example4.db ns2/example.db
start --noclean --restart --port ${PORT} notify ns2
start_server --noclean --restart --port ${PORT} notify ns2
try=0
while test $try -lt 45
......
......@@ -337,7 +337,7 @@ rm named.pid
cd ..
sleep 10
if
start --noclean --restart --port ${PORT} nsupdate ns1
start_server --noclean --restart_server --port ${PORT} nsupdate ns1
then
echo_i "restarted server ns1"
else
......@@ -519,7 +519,7 @@ sleep 3
# that the data served by the new server process are exactly
# those dumped to the master file by "rndc stop".
rm -f ns1/*jnl
start --noclean --restart --port ${PORT} nsupdate ns1
start_server --noclean --restart_server --port ${PORT} nsupdate ns1
for try in 0 1 2 3 4 5 6 7 8 9; do
iret=0
$DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
......
......@@ -61,7 +61,7 @@ echo_i "deleting _default.nzd database"
rm -f ns1/_default.nzd
echo_i "starting ns1 which should migrate the .nzf to .nzd"
start --noclean --restart --port ${PORT} nzd2nzf ns1
start_server --noclean --restart --port ${PORT} nzd2nzf ns1
n=$((n+1))
echo_i "querying for zone data from migrated zone config ($n)"
......
......@@ -215,7 +215,7 @@ restart () {
done
fi
fi
start --noclean --restart --port ${PORT} rpz ns$1
start_server --noclean --restart_server --port ${PORT} rpz ns$1
load_db
dnsrps_loaded
sleep 1
......@@ -482,7 +482,7 @@ for mode in native dnsrps; do
continue
else
echo_i "running DNSRPS sub-test"
start --noclean --restart --port ${PORT} rpz
start_server --noclean --restart_server --port ${PORT} rpz
sleep 3
fi
;;
......
......@@ -51,7 +51,7 @@ run_server() {
echo_i "starting resolver using named.$TESTNAME.conf"
cp -f ns2/named.$TESTNAME.conf ns2/named.conf
start --noclean --restart --port ${PORT} rpzrecurse ns2
start_server --noclean --restart_server --port ${PORT} rpzrecurse ns2
sleep 3
}
......@@ -133,7 +133,7 @@ for mode in native dnsrps; do
continue
else
echo_i "running DNSRPS sub-test"
start --noclean --restart --port ${PORT} rpzrecurse
start_server --noclean --restart_server --port ${PORT} rpzrecurse
sleep 3
fi
;;
......
......@@ -250,7 +250,7 @@ fi
echo_i "Re-starting slave"
start --noclean --port ${PORT} rrsetorder ns2
start_server --noclean --port ${PORT} rrsetorder ns2
#
#
......
......@@ -1055,7 +1055,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status+ret))
echo_i "start ns4"
start --noclean --restart --port ${PORT} serve-stale ns4
start_server --noclean --restart --port ${PORT} serve-stale ns4
n=$((n+1))
echo_i "verify ancient cache statistics (serve-stale disabled) ($n)"
......
......@@ -55,7 +55,7 @@ digcomp knowngood.dig.out.rec dig.out.ns3 || ret=1
$PERL $SYSTEMTESTTOP/stop.pl stub ns3
echo_i "re-starting stub server"
start --noclean --restart --port ${PORT} stub ns3
start_server --noclean --restart_server --port ${PORT} stub ns3
}
done
......
......@@ -144,7 +144,7 @@ status=`expr $status + $ret`
echo_i "stop and restart slave"
$PERL $SYSTEMTESTTOP/stop.pl unknown ns2
start --noclean --restart --port ${PORT} unknown ns2
start_server --noclean --restart --port ${PORT} unknown ns2
# server may be answering queries before zones are loaded,
# so retry a few times if this query fails
......@@ -168,7 +168,7 @@ status=`expr $status + $ret`
echo_i "stop and restart inline slave"
$PERL $SYSTEMTESTTOP/stop.pl unknown ns3
start --noclean --restart --port ${PORT} unknown ns3
start_server --noclean --restart --port ${PORT} unknown ns3
# server may be answering queries before zones are loaded,
# so retry a few times if this query fails
......
......@@ -447,7 +447,7 @@ tmp=0
$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.1.test$n
grep "status: NOERROR," dig.out.1.test$n > /dev/null || tmp=1
$PERL $SYSTEMTESTTOP/stop.pl xfer ns3
start --noclean --restart --port ${PORT} xfer ns3
start_server --noclean --restart --port ${PORT} xfer ns3
check_mapped () {
$DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.test$n
grep "status: NOERROR," dig.out.2.test$n > /dev/null || return 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment