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

ctdb-tests: Start daemons in ctdb_test_init(), stop them in ctdb_test_exit()

Browse Source 
This makes tests self-contained.  They can also now be individually
looped, if necessary.

Most tests (all but 1 complex, more than 50% of simple) restart the
daemons anyway, so this simplification is worth it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-10-08 13:30:55 +11:00 committed by Amitay Isaacs
parent e733e4cb74
commit 0e9ead8f28
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,22 +44,8 @@ ctdb_test_exit ()
eval "$ctdb_test_exit_hook" || true
unset ctdb_test_exit_hook
if $ctdb_test_restart_scheduled || ! cluster_is_healthy ; then
echo "Restarting CTDB (scheduled)..."
ctdb_stop_all || true # Might be restarting some daemons were shutdown
echo "Reconfiguring cluster..."
setup_ctdb
ctdb_init
else
# This could be made unconditional but then we might get
# duplication from the recovery in ctdb_init(). We want to
# leave the recovery in ctdb_init() so that future tests that
# might do a manual restart mid-test will benefit.
echo "Forcing a recovery..."
onnode 0 $CTDB recover
fi
echo "Stopping cluster..."
ctdb_stop_all
exit $status
}
@ -71,9 +57,19 @@ ctdb_test_exit_hook_add ()
ctdb_test_init ()
{
ctdb_test_restart_scheduled=false
ctdb_test_restart_scheduled=false
trap "ctdb_test_exit" 0
trap "ctdb_test_exit" 0
ctdb_stop_all >/dev/null 2>&1 || true
echo "Configuring cluster..."
setup_ctdb || exit 1
echo "Starting cluster..."
ctdb_init || exit 1
echo "*** SETUP COMPLETE AT $(date '+%F %T'), RUNNING TEST..."
}
########################################