Add an extra ctdb recovery to test function restart_ctdb().

There are still very rare cases where IPs haven't been reallocated
before the beginning of the next test, so this adds a sleep and an
extra call to "ctdb recover" to restart_ctdb().

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/scripts/ctdb_test_functions.bash b/tests/scripts/ctdb_test_functions.bash
index 6485868cc2df152eb8be2f9ee0ac6c6e7fb3f0d3..40f1e4fa6f2fb90432d7acee0c922d9846264bb2 100644 (file)
--- a/tests/scripts/ctdb_test_functions.bash
+++ b/tests/scripts/ctdb_test_functions.bash
@@ -631,9 +631,9 @@ restart_ctdb ()
     # cluster to stabilise before a subsequent test.
     echo "Forcing a recovery..."
     onnode -q 0 ctdb recover
-
-    #echo "Sleeping to allow ctdb to settle..."
-    #sleep_for 10
+    sleep_for 1
+    echo "Forcing a recovery..."
+    onnode -q 0 ctdb recover
 
     echo "ctdb is ready"
 }