From 0ae3d009f36066c794e6f39c6dd45735e706df34 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 14 Nov 2013 20:36:52 +1100 Subject: 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 Reviewed-by: Michael Adam --- ctdb/tests/scripts/integration.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 4f0f68b626..88161c1a2d 100644 --- 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" -- cgit