From eb38d02eb77dd654c8ed79fe985f738431918c9f Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 23 Aug 2016 10:23:56 +1000 Subject: [PATCH] ctdb-tests: Drop attempts to pass arguments to ctdbd on (re)start This is not used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12170 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/scripts/integration.bash | 6 ++---- ctdb/tests/simple/scripts/local_daemons.bash | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 0f12c1f3020..b2a3451049c 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -536,7 +536,7 @@ restart_ctdb_1 () # Restart CTDB on all nodes. Override for local daemons. _restart_ctdb_all () { - onnode -p all $CTDB_TEST_WRAPPER restart_ctdb_1 "$@" + onnode -p all $CTDB_TEST_WRAPPER restart_ctdb_1 } # Nothing needed for a cluster. Override for local daemons. @@ -547,8 +547,6 @@ setup_ctdb () restart_ctdb () { - # "$@" is passed to restart_ctdb_all. - echo -n "Restarting CTDB" if $ctdb_test_restart_scheduled ; then echo -n " (scheduled)" @@ -557,7 +555,7 @@ restart_ctdb () local i for i in $(seq 1 5) ; do - _restart_ctdb_all "$@" || { + _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 765655ecaa3..0ad7eb85e11 100644 --- a/ctdb/tests/simple/scripts/local_daemons.bash +++ b/ctdb/tests/simple/scripts/local_daemons.bash @@ -95,7 +95,6 @@ setup_ctdb () daemons_start_1 () { local pnn="$1" - shift # "$@" gets passed to ctdbd local public_addresses_all="${TEST_VAR_DIR}/public_addresses_all" local public_addresses_mine="${TEST_VAR_DIR}/public_addresses.${pnn}" @@ -147,12 +146,10 @@ EOF daemons_start () { - # "$@" gets passed to ctdbd - echo "Starting $TEST_LOCAL_DAEMONS ctdb daemons..." for i in $(seq 0 $(($TEST_LOCAL_DAEMONS - 1))) ; do - daemons_start_1 $i "$@" + daemons_start_1 $i done } @@ -166,5 +163,5 @@ maybe_stop_ctdb () _restart_ctdb_all () { daemons_stop - daemons_start "$@" + daemons_start }