Fix catzones.tdir

NLnetLabs · Dec 4, 2024 · 32734a8 · 32734a8
1 parent 9aab672
commit 32734a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/tpkg/catzones.tdir/catzones.primary.conf.in b/tpkg/catzones.tdir/catzones.primary.conf.in
@@ -2,7 +2,7 @@ server:
 	zonesdir: "."
 	username: ""
 	database: ""
-	verbosity: 2
+	verbosity: 3
 	ip-address: 127.0.0.1
 	port: @PRIMARY_PORT@
 	pidfile: "primary.pid"

diff --git a/tpkg/catzones.tdir/catzones.test b/tpkg/catzones.tdir/catzones.test
@@ -33,8 +33,8 @@ print_catzone_status() {
 	while [ $# -gt 0 ]
 	do
 		Z=$1.invalid
-		S=`get_serial $CTRL $Z`
-		M=`get_n_members $CTRL $Z`
+		S=`get_serial "$CTRL" $Z`
+		M=`get_n_members "$CTRL" $Z`
 		echo "	$1 (serial: $S, # members: $M)"
 		shift
 	done
@@ -43,6 +43,7 @@ print_catzone_status() {
 
 print_status() {
 	return
+	echo "## $*"
 	$SLEEP
 	print_catzone_status primary catalog1 catalog2 catalog3
 	print_catzone_status secondary catalog1
@@ -85,6 +86,7 @@ do   echo zone${i}.invalid
 done | $PRIMARY_CONTROL delzones >> nsd-control.log
 
 print_status "$(($N_MEMBER_ZONES / 4)) member zones deleted"
+sleep .1
 
 $PRIMARY_CONTROL write
 wait_logfile primary.log "writing zone catalog1.invalid" 10
@@ -93,8 +95,9 @@ CATALOG1_SERIAL=`awk 'FNR==2{print $NF}' primary.catalog1.invalid.zone`
 CATALOG2_SERIAL=`awk 'FNR==2{print $NF}' primary.catalog2.invalid.zone`
 CATALOG3_SERIAL=`awk 'FNR==2{print $NF}' primary.catalog3.invalid.zone`
 
-wait_logfile secondary.log "received update to serial $CATALOG1_SERIAL" 10
-wait_logfile secondary2.log "received update to serial $CATALOG2_SERIAL" 10
+wait_logfile secondary.log "zone catalog1.invalid. received update to serial $CATALOG1_SERIAL" 10
+wait_logfile secondary2.log "zone catalog2.invalid. received update to serial $CATALOG2_SERIAL" 10
+
 
 $SECONDARY_CONTROL write
 wait_logfile secondary.log "writing zone catalog1.invalid" 10