From 9256010cfbd3d82ba2eba0311385eede91819490 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 23 Sep 2013 16:24:46 +1000 Subject: tests/integration: Tweak ctdbd startup options * --public-interface is not needed * Add --sloppy-start to speed up restarts Signed-off-by: Martin Schwenke (This used to be ctdb commit d0dec5b8e60316701fdd02150c4dd8f01aacbfda) --- ctdb/tests/scripts/integration.bash | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ctdb/tests/scripts/integration.bash') diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index df93dcf6bb..888528cb2b 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -585,11 +585,7 @@ daemons_start_1 () fi local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES") - local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --listen=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --log-ringbuf-size=10000 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" - - if [ -n "$TEST_LOCAL_DAEMONS" ] ; then - ctdb_options="$ctdb_options --public-interface=lo" - fi + local ctdb_options="--sloppy-start --reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --listen=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --log-ringbuf-size=10000 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" if [ $pnn -eq $no_public_ips ] ; then ctdb_options="$ctdb_options --public-addresses=/dev/null" -- cgit