From: Martin Schwenke <martin@meltin.net>
Date: Fri, 10 May 2019 09:22:16 +0000 (+1000)
Subject: ctdb-tests: Actually restart if cluster doesn't become healthy
X-Git-Tag: tdb-1.4.1~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97ad353a67ce0232d7ca5637f1bf8886e2df1aca;p=thirdparty%2Fsamba.git

ctdb-tests: Actually restart if cluster doesn't become healthy

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13924

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index ce5bd576b24..32a729d0249 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -520,6 +520,7 @@ ctdb_init ()
 {
     local i
     for i in $(seq 1 5) ; do
+	ctdb_stop_all >/dev/null 2>&1 || :
 	ctdb_start_all || {
 	    echo "Start failed.  Trying again in a few seconds..."
 	    sleep_for 5