From 2e3ad8c20d2964fba14d0d5b0b36c334ac22caa5 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 18 Dec 2018 14:31:24 +1100 Subject: [PATCH] ctdb-tests: Minimise chances of test interfering with itself Checking that the database contains 0 records cause a traverse. This may take a lock and cause vacuuming to fail (or be deferred for a particular record/chain). Minimise the chance of this happening by only checking for 0 records every 10 seconds. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/simple/69_recovery_resurrect_deleted.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh b/ctdb/tests/simple/69_recovery_resurrect_deleted.sh index b69bc5d2672..2c8fc12edef 100755 --- a/ctdb/tests/simple/69_recovery_resurrect_deleted.sh +++ b/ctdb/tests/simple/69_recovery_resurrect_deleted.sh @@ -63,8 +63,9 @@ echo "Wait until vacuuming deletes the record on active nodes" # 1. Original node processes delete queue, asks lmaster to fetch # 2. lmaster recoverd fetches # 3. lmaster processes delete queue -# If vacuuming is just missed then need an extra interval. -wait_until $((vacuum_interval * 4)) database_has_zero_records +# If vacuuming is just missed then need an extra interval +t=$((vacuum_interval * 4)) +wait_until "${t}/10" database_has_zero_records echo "Continue node ${first}" try_command_on_node $first $CTDB continue