From 941a2d0a3b714085b58b1501cc18fd466db961b6 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 22 Jul 2020 14:43:01 +1000 Subject: [PATCH] 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 Reviewed-by: Amitay Isaacs --- ctdb/tests/scripts/integration.bash | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.47.3