diff options
| -rwxr-xr-x | ctdb/tests/simple/60_recoverd_missing_ip.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ctdb/tests/simple/60_recoverd_missing_ip.sh b/ctdb/tests/simple/60_recoverd_missing_ip.sh index 0734aeef8a..88e450227b 100755 --- a/ctdb/tests/simple/60_recoverd_missing_ip.sh +++ b/ctdb/tests/simple/60_recoverd_missing_ip.sh @@ -37,10 +37,6 @@ fi echo "$test_ip/$mask is on $iface" -# Push out the next monitor event so it is less likely to be cancelled -# and result in services not being restarted properly. -try_command_on_node $test_node $CTDB eventscript monitor - echo "Deleting IP $test_ip from all nodes" try_command_on_node -v $test_node $CTDB delip -n all $test_ip @@ -61,9 +57,9 @@ ctdb_test_exit_hook_add my_exit_hook # delips is complete. try_command_on_node $test_node $CTDB sync -# This effectively cancels any monitor event that is in progress and -# runs a new one -try_command_on_node $test_node $CTDB eventscript monitor +# Wait for a monitor event. Then the next steps are unlikely to occur +# in the middle of a monitor event and will have the expected effect. +wait_for_monitor_event $test_node if [ -z "$TEST_LOCAL_DAEMONS" ] ; then # Stop monitor events from bringing up the link status of an interface |