diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-09-23 16:24:46 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-10-22 13:07:13 +1100 |
| commit | 9256010cfbd3d82ba2eba0311385eede91819490 (patch) | |
| tree | e8216bd901e47646b924d7c4a2c4295b877b668c /ctdb/tests/scripts/integration.bash | |
| parent | 4812291ff843a67dbe3e7d26930fd2e7f4b2cbb0 (diff) | |
tests/integration: Tweak ctdbd startup options
* --public-interface is not needed
* Add --sloppy-start to speed up restarts
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit d0dec5b8e60316701fdd02150c4dd8f01aacbfda)
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 6 |
1 files changed, 1 insertions, 5 deletions
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" |