From: Martin Schwenke <martin@meltin.net>
Date: Thu, 20 Sep 2018 04:42:42 +0000 (+1000)
Subject: ctdb-tests: Be more efficient about starting/stopping local daemons
X-Git-Tag: tdb-1.3.17~1431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eabac52955a191ef931ee739eff3ae7eafbf7b9;p=thirdparty%2Fsamba.git

ctdb-tests: Be more efficient about starting/stopping local daemons

Don't loop, just use onnode all.

For shutting down, use onnode -p all.  This results in a significant
time saving for stopping many deamons because "ctdb shutdown" is now
synchronous.

onnode -p all can be used to start daemons directly because they
daemonize.  However, this does not work under valgrind because the
valgrind process does not exit, so onnode will wait forever for it.
In this case, use onnode without the -p option.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 6adec79c2af..04597e9f1b3 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -168,12 +168,9 @@ start_ctdb_1 ()
 
 ctdb_start_all ()
 {
-    echo "Starting $TEST_LOCAL_DAEMONS ctdb daemons..."
+	echo "Starting $TEST_LOCAL_DAEMONS ctdb daemons..."
 
-    local pnn
-    for pnn in $(seq 0 $(($TEST_LOCAL_DAEMONS - 1))) ; do
-	start_ctdb_1 "$pnn"
-    done
+	onnode all $VALGRIND ctdbd
 }
 
 stop_ctdb_1 ()
@@ -185,12 +182,9 @@ stop_ctdb_1 ()
 
 ctdb_stop_all ()
 {
-    echo "Stopping $TEST_LOCAL_DAEMONS ctdb daemons..."
+	echo "Stopping $TEST_LOCAL_DAEMONS ctdb daemons..."
 
-    local pnn
-    for pnn in $(seq 0 $(($TEST_LOCAL_DAEMONS - 1))) ; do
-	stop_ctdb_1 "$pnn"
-    done
+	onnode -p all $CTDB shutdown
 }
 
 restart_ctdb_1 ()