diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-05-10 16:58:16 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-05-11 10:33:27 +1000 |
| commit | f510ae64cb556e80af9512b1fb0107f68a696120 (patch) | |
| tree | f49b23aca299a71432398da2e0ec893db5deecf9 /ctdb/tests/scripts/integration.bash | |
| parent | 99ed2d11e130a2fc644d16c4fcdfcc876d8c8b2a (diff) | |
tests: In integration tests, use --node-ip to avoid locking weirdness
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit a00e80c701a0f9695f41c24e0360c25c0873d49d)
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 2dab6d77e4..9d5affc568 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -556,7 +556,8 @@ daemons_start_1 () echo "Node $no_public_ips will have no public IPs." fi - local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemons.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" + local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES") + local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemons.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state" if [ -z "$CTDB_TEST_REAL_CLUSTER" ]; then ctdb_options="$ctdb_options --public-interface=lo" |