From b68105b8f7c20692d23d457f2777edcf44f12bb8 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 30 Sep 2020 10:48:38 +1000 Subject: [PATCH] ctdb-tests: Strengthen node state checking in ctdb disable/enable test Check that the desired state is set on all nodes instead of just the test node. This ensures that node flags have correctly propagated across the cluster. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Tue Oct 6 04:32:06 UTC 2020 on sn-devel-184 --- ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh index 9a1616ceefc..3f400975e66 100755 --- a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh +++ b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh @@ -14,10 +14,10 @@ select_test_node_and_ips echo "Disabling node $test_node" try_command_on_node 1 $CTDB disable -n $test_node -wait_until_node_has_status $test_node disabled +wait_until_node_has_status $test_node disabled 30 all wait_until_node_has_no_ips "$test_node" echo "Re-enabling node $test_node" try_command_on_node 1 $CTDB enable -n $test_node -wait_until_node_has_status $test_node enabled +wait_until_node_has_status $test_node enabled 30 all wait_until_node_has_some_ips "$test_node" -- 2.47.3