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: Drop attempts to pass arguments to ctdbd on (re)start

Browse Source 
This is not used.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12170

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-08-23 10:23:56 +10:00 committed by Amitay Isaacs
parent fd443b8cce
commit eb38d02eb7
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/tests/scripts/integration.bash
View File

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

7
ctdb/tests/simple/scripts/local_daemons.bash
View File

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