summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Talur <rtalur@redhat.com>2015-12-30 21:07:54 +0530
committerRaghavendra Talur <rtalur@redhat.com>2016-01-07 23:38:37 -0800
commit6019e988a3ec40fb78127dce577be125ac23af98 (patch)
treeb4bf849e152c47f37df5aa6b20fe0bdf03bebf9b
parenteb0d9513ece40c5d4cb7f3bae13874bbfe4fcff8 (diff)
tests: use SIGKILL in cleanup, not SIGTERM
Sending a SIGTERM to test processes and waiting a second for them to gracefully exit before sending a SIGKILL seems like a waste of time. Just send SIGKILL directly. Change-Id: Icc73b07eae47876ba41955793a8daf77a964a0e0 BUG: 1294826 Signed-off-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-on: http://review.gluster.org/13121 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-rw-r--r--tests/include.rc7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/include.rc b/tests/include.rc
index 4bd4c49a33b..76b81875bbc 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -444,13 +444,6 @@ function cleanup()
umount $flag /tmp/mnt* 2>/dev/null
- # Kill all gluster processes with SIGTERM
- killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true;
- test x"$OSTYPE" = x"NetBSD" && pkill -15 perfused rpc.statd || true
-
- # Wait a second for SIGTERM to work
- sleep 1
-
# Send SIGKILL to all gluster processes that are still running
killall -9 glusterfs glusterfsd glusterd 2>/dev/null || true;
test x"$OSTYPE" = x"NetBSD" && pkill -9 perfused rpc.statd || true