sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

ctdb-tests: Do not use ctdbd_wrapper in local daemon tests

Browse Source 
Run the daemon directly and shut it down using ctdb shutdown.

The wrapper waits for ctdbd to reach >=FIRST_RECOVERY runstate within
a timeout period and shuts ctdbd down if that doesn't happen.  This is
only really used to ensure that ctdbd doesn't exit early after an
apparently successful start.  There are no known cases where ctdbd
will continue running but fail to reach >=FIRST_RECOVERY runstate.

When ctdbd is started in tests, the test code will wait until ctdbd is
in a healthy state on all nodes before proceeding, so there is
effectively no change in behaviour.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-07-10 15:57:19 +10:00 committed by Amitay Isaacs
parent 8bde6fa09c
commit a9ac33015b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,6 @@
# If we're not running on a real cluster then we need a local copy of
# ctdb (and other stuff) in $PATH and we will use local daemons.
# For ctdbd_wrapper
PATH="${CTDB_SCRIPTS_BASE}:${PATH}"
hdir="$CTDB_SCRIPTS_HELPER_BINDIR"
export CTDB_EVENTD="${hdir}/ctdb-eventd"
export CTDB_EVENT_HELPER="${hdir}/ctdb-event"
@ -166,8 +163,7 @@ start_ctdb_1 ()
{
local pnn="$1"
CTDBD="${VALGRIND} ctdbd" \
onnode "$pnn" ctdbd_wrapper start
onnode "$pnn" $VALGRIND ctdbd
}
ctdb_start_all ()
@ -184,7 +180,7 @@ stop_ctdb_1 ()
{
local pnn="$1"
onnode "$pnn" ctdbd_wrapper stop
onnode "$pnn" $CTDB shutdown
}
ctdb_stop_all ()