From: Martin Schwenke <martin@meltin.net>
Date: Fri, 23 Feb 2018 01:21:23 +0000 (+1100)
Subject: ctdb_tests: Reconfigure the cluster when restarting CTDB
X-Git-Tag: talloc-2.1.12~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5615bdf7ff7af06eb599639c1bef444614e0dd93;p=thirdparty%2Fsamba.git

ctdb_tests: Reconfigure the cluster when restarting CTDB

The previous test might have made configuration changes, so call
setup_ctdb() to cause the configuration to be rewritten.  This is only
really useful in local daemons tests.

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 7a1938ed50c..eec9e3b20df 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -44,6 +44,10 @@ ctdb_test_exit ()
     if $ctdb_test_restart_scheduled || ! cluster_is_healthy ; then
 	echo "Restarting CTDB (scheduled)..."
 	ctdb_stop_all || true  # Might be restarting some daemons were shutdown
+
+	echo "Reconfiguring cluster..."
+	setup_ctdb
+
 	ctdb_start_all
     else
 	# This could be made unconditional but then we might get