summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-02-23 12:21:23 +1100
committerAmitay Isaacs <amitay@samba.org>2018-03-19 02:23:18 +0100
commit5615bdf7ff7af06eb599639c1bef444614e0dd93 (patch)
tree388a869c30f9d70bcee7bb841d04a7a67bd772e1 /ctdb
parentbdfc8b7e3efd813ab2e4daa50a2ef9abeb844eef (diff)
downloadsamba-5615bdf7ff7af06eb599639c1bef444614e0dd93.tar.gz
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>
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/tests/scripts/integration.bash4
1 files changed, 4 insertions, 0 deletions
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