From: Martin Schwenke <martin@meltin.net>
Date: Tue, 6 Mar 2018 01:29:52 +0000 (+1100)
Subject: ctdb-tests: Use onnode to start/stop local daemons
X-Git-Tag: talloc-2.1.12~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85a4375788d8ef8345ec390807f18299abdadb20;p=thirdparty%2Fsamba.git

ctdb-tests: Use onnode to start/stop local daemons

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 aad533b969b..1858492bcd5 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -192,17 +192,9 @@ EOF
 start_ctdb_1 ()
 {
 	local pnn="$1"
-	local node_dir=$(node_dir "$pnn")
-	local pidfile=$(node_pidfile "$pnn")
-	local conf=$(node_conf "$pnn")
-	local socket=$(node_socket "$pnn")
 
 	CTDBD="${VALGRIND} ctdbd --sloppy-start --nopublicipcheck" \
-	     CTDB_BASE="$node_dir" \
-	     CTDBD_CONF="$conf" \
-	     CTDB_PIDFILE="$pidfile" \
-	     CTDB_SOCKET="$socket" \
-	     ctdbd_wrapper start
+	     onnode "$pnn" ctdbd_wrapper start
 }
 
 daemons_start ()
@@ -218,16 +210,8 @@ daemons_start ()
 stop_ctdb_1 ()
 {
 	local pnn="$1"
-	local node_dir=$(node_dir "$pnn")
-	local pidfile=$(node_pidfile "$pnn")
-	local conf=$(node_conf "$pnn")
-	local socket=$(node_socket "$pnn")
-
-	CTDB_BASE="$node_dir" \
-		 CTDBD_CONF="$conf" \
-		 CTDB_PIDFILE="$pidfile" \
-		 CTDB_SOCKET="$socket" \
-		 ctdbd_wrapper stop
+
+	onnode "$pnn" ctdbd_wrapper stop
 }
 
 daemons_stop ()