summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2020-07-22 14:43:01 +1000
committerMartin Schwenke <martins@samba.org>2020-07-22 05:07:45 +0000
commit941a2d0a3b714085b58b1501cc18fd466db961b6 (patch)
tree4887d7157554547db9cfc34e6cb02c2b5c850740 /ctdb
parentc9dfdeaddc95bb278a23e43476e1af2a19cd783d (diff)
downloadsamba-941a2d0a3b714085b58b1501cc18fd466db961b6.tar.gz
Revert "ctdb-tests: Don't bother shutting down daemons in ctdb_init()"
Fix missing Reviewed-by: tag. This reverts commit 58f9f699f181ac217cda8de512b8385da173f884. 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.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 9b297313c8b..aa1554ee318 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -599,6 +599,8 @@ wait_until_node_has_no_ips ()
ctdb_init ()
{
+ ctdb_nodes_stop >/dev/null 2>&1 || :
+
if ! ctdb_nodes_start ; then
echo "Cluster start failed"
return 1