summaryrefslogtreecommitdiffstats
path: root/ctdb/tests/simple/20_ctdb_getmonmode.sh
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2008-12-08 08:15:18 +1100
committerMartin Schwenke <martin@meltin.net>2008-12-08 08:15:18 +1100
commitc9ca8ccc2312757f8c8a59c79997976796120417 (patch)
tree427ade75a587b1f956488c51e5dcecf1b01d9373 /ctdb/tests/simple/20_ctdb_getmonmode.sh
parent805c5bf1f33d250fa1f9f6fac0e46ff9358c8dee (diff)
downloadsamba-c9ca8ccc2312757f8c8a59c79997976796120417.tar.gz
samba-c9ca8ccc2312757f8c8a59c79997976796120417.tar.xz
samba-c9ca8ccc2312757f8c8a59c79997976796120417.zip
When running with local daemons, provided there is more than 2 of
them, randomly pick a single node that will not have any public IPs assigned. This will make life a bit more interesting and will simulate what happens on real clusters with a management node. Some tests were disabling a node to implicitly trigger a ctdb restart - now use an explicit restart of ctdb when it is required. 17_ctdb_config_delete_ip.sh now randomly chooses a public IP on any node to disable - this works around a problem where the hardcoded node might not have any public addresses. Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit 3d59783c0e9478f4766c380945d6200fc654f5d9)
Diffstat (limited to 'ctdb/tests/simple/20_ctdb_getmonmode.sh')
-rwxr-xr-xctdb/tests/simple/20_ctdb_getmonmode.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tests/simple/20_ctdb_getmonmode.sh b/ctdb/tests/simple/20_ctdb_getmonmode.sh
index 97bcf21bc7e..215f0cfb54a 100755
--- a/ctdb/tests/simple/20_ctdb_getmonmode.sh
+++ b/ctdb/tests/simple/20_ctdb_getmonmode.sh
@@ -62,8 +62,8 @@ try_command_on_node -v 0 ctdb disablemonitor -n $test_node
onnode 0 $CTDB_TEST_WRAPPER wait_until_node_has_status $test_node monoff
-echo "That worked! Disabling node $test_node to force a restart..."
+echo "That worked! Restarting cluster to restore configuration..."
-try_command_on_node $test_node ctdb disable
+restart_ctdb
ctdb_test_exit