1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00

Allow proxy_node to be specified for wait_until_node_has_status().

Default to "any"... but allow specification because sometimes it
matters...

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit c12c97598afcd07ce4876b26e0b734bc825e54c1)
This commit is contained in:
Martin Schwenke 2011-02-11 15:13:37 +11:00
parent 47f1a7dd5b
commit f5115a9ea6

View File

@ -488,10 +488,11 @@ wait_until_node_has_status ()
local pnn="$1"
local status="$2"
local timeout="${3:-30}"
local proxy_pnn="${4:-any}"
echo "Waiting until node $pnn has status \"$status\"..."
if ! wait_until $timeout onnode any $CTDB_TEST_WRAPPER node_has_status "$pnn" "$status" ; then
if ! wait_until $timeout onnode $proxy_pnn $CTDB_TEST_WRAPPER node_has_status "$pnn" "$status" ; then
for i in "onnode -q any $CTDB status" "onnode -q any onnode all $CTDB scriptstatus" ; do
echo "$i"
$i || true