sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ctdb-tests: Handle interactions with monitor events

Browse Source 
In the first case, reconfiguration can longer happen in a monitor
event, so this is no longer a problem.  Drop it.

Running a monitor event by hand no longer cancels the existing monitor
event.  Instead the hand-run event fails.  So do this differently and
just wait for a monitor event before continuing.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu Feb 13 04:05:57 CET 2014 on sn-devel-104
This commit is contained in:
Martin Schwenke 2014-02-12 15:33:19 +11:00 committed by Amitay Isaacs
parent f1a20d748f
commit a9ccdec008
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctdb/tests/simple/60_recoverd_missing_ip.sh
View File

@ -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