From f67a1043b381f623ec9c97ac137568ca7ab6cd8a Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 29 Nov 2013 14:07:43 +1100 Subject: [PATCH] ctdb/tests/integration: Decentralise the daemon restart code Signed-off-by: Martin Schwenke Reviewed-by: Michael Adam --- ctdb/tests/scripts/integration.bash | 15 ++++++++------- ctdb/tests/simple/scripts/local_daemons.bash | 6 ++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 4d22f4150fd..665fc7dd694 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -449,6 +449,12 @@ _restart_ctdb () fi } +# Restart CTDB on all nodes. Override for local daemons. +_restart_ctdb_all () +{ + onnode -p all $CTDB_TEST_WRAPPER _restart_ctdb "$@" +} + # Nothing needed for a cluster. Override for local daemons. setup_ctdb () { @@ -457,7 +463,7 @@ setup_ctdb () restart_ctdb () { - # "$@" is passed to ctdbd start. + # "$@" is passed to restart_ctdb_all. echo -n "Restarting CTDB" if $ctdb_test_restart_scheduled ; then @@ -467,12 +473,7 @@ restart_ctdb () local i for i in $(seq 1 5) ; do - if [ -n "$CTDB_NODES_SOCKETS" ] ; then - daemons_stop - daemons_start "$@" - else - onnode -p all $CTDB_TEST_WRAPPER _restart_ctdb "$@" - fi || { + _restart_ctdb_all "$@" || { echo "Restart failed. Trying again in a few seconds..." sleep_for 5 continue diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash index 6bd2138a828..7c3407f8aa7 100644 --- a/ctdb/tests/simple/scripts/local_daemons.bash +++ b/ctdb/tests/simple/scripts/local_daemons.bash @@ -127,3 +127,9 @@ maybe_stop_ctdb () daemons_stop fi } + +_restart_ctdb_all () +{ + daemons_stop + daemons_start "$@" +} -- 2.11.4.GIT