From de94bee5f3279643359f8a8607d92e6eebdddd3c Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 19 Sep 2023 14:06:15 +1000 Subject: [PATCH 1/2] Wait for the test zone to finish re-loading 'rndc thaw' initiates asynchrous loading of all the zones similar to 'rndc load'. Wait for the test zone's load to complete before testing that it is updatable again. (cherry picked from commit 5b3238aa85ab6e1e1044ae337854e4c00664c359) --- bin/tests/system/rndc/tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh index 75522cb71b..ac0b7c189f 100644 --- a/bin/tests/system/rndc/tests.sh +++ b/bin/tests/system/rndc/tests.sh @@ -86,6 +86,8 @@ status=$((status+ret)) echo_i "rndc thaw" $RNDCCMD 10.53.0.2 thaw | sed 's/^/ns2 /' | cat_i +wait_for_log 3 "zone_postload: zone nil/IN: done" ns2/named.run + n=$((n+1)) echo_i "checking zone now writable ($n)" ret=0 From 745db8775b3973b77f018beaf26abe3418d5bc97 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 20 Sep 2023 15:49:59 +1000 Subject: [PATCH 2/2] Document that reloading happens asynchronously (cherry picked from commit e33dbd0cbd48aed7d1c1eb25fa61d8173d488d5e) --- bin/rndc/rndc.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/rndc/rndc.rst b/bin/rndc/rndc.rst index 35a4f31752..f34975baca 100644 --- a/bin/rndc/rndc.rst +++ b/bin/rndc/rndc.rst @@ -428,6 +428,7 @@ Currently supported commands are: .. option:: zone [class [view]] If a zone is specified, this command reloads only the given zone. + If no zone is specified, the reloading happens asynchronously. .. program:: rndc @@ -594,7 +595,8 @@ Currently supported commands are: refused. If the zone has changed and the ``ixfr-from-differences`` option is in use, the journal file is updated to reflect changes in the zone. Otherwise, if the zone has changed, any existing - journal file is removed. + journal file is removed. If no zone is specified, the reloading happens + asynchronously. See also :option:`rndc freeze`.