ctdb:tests/integration: Be more careful when killing ctdbd

Also match $TEST_VAR_DIR in the socket name.  This means that we'll
only ever kill ctdbd process belong to our own test run.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 4f0f68b62636ba91a2bcd31934d0ba65e96b3497..88161c1a2dae4f1552e2b5fdc4cce6d033fb3440 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -514,7 +514,7 @@ daemons_stop ()
     echo "Sleeping for a while..."
     sleep_for 1
 
-    local pat="ctdbd --socket=.* --nlist .* --nopublicipcheck"
+    local pat="ctdbd --socket=${TEST_VAR_DIR}/.* --nlist .* --nopublicipcheck"
     if pgrep -f "$pat" >/dev/null ; then
        echo "Killing remaining daemons..."
        pkill -f "$pat"