From: Martin Schwenke Date: Thu, 18 Oct 2018 07:02:13 +0000 (+1100) Subject: ctdb-daemon: Do not fork when CTDB_TEST_MODE is set X-Git-Tag: tdb-1.3.17~868 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e16e95f74c06bf381db666007a30ecb0e1ff7ce;p=thirdparty%2Fsamba.git ctdb-daemon: Do not fork when CTDB_TEST_MODE is set Explicitly background ctdbd instead. This has the advantage of leaving stdin open. ctdbd can then be enhanced to exit when stdin closes, allowing better cleanup in a test environment. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Tue Nov 6 10:30:14 CET 2018 on sn-devel-144 --- diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index ebe111ddde6..a2870d0d111 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -374,6 +374,9 @@ int main(int argc, const char *argv[]) fast_start = true; } + /* Don't fork when running in test mode */ + interactive = interactive || test_mode != NULL; + /* start the protocol running (as a child) */ return ctdb_start_daemon(ctdb, !interactive); diff --git a/ctdb/tests/local_daemons.sh b/ctdb/tests/local_daemons.sh index 6f6d03ffa08..9329a60643c 100755 --- a/ctdb/tests/local_daemons.sh +++ b/ctdb/tests/local_daemons.sh @@ -334,7 +334,7 @@ local_daemons_start () onnode_common - onnode "$_nodes" "${VALGRIND:-} ctdbd" + onnode "$_nodes" "${VALGRIND:-} ctdbd &" } local_daemons_stop ()