summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2015-02-27 13:25:37 +0100
committerNiels de Vos <ndevos@redhat.com>2015-02-27 15:24:01 -0800
commita0f30e637e6ee32b113fd21268be17e0618d39df (patch)
tree910f57b46c230c8f3d2845148e2c5eae539da480
parentd5624b2d4baf509ad8d6037a0d9cabf9cd5ab1c5 (diff)
Tests: At cleanup time, kill rpc.statd on NetBSD
The NFS server cannot start is a rpc.statd is still running. Make sure the cleanup procedure remove any leftover rpc.statd. BUG: 1129939 Change-Id: I03c41b18526583f3304321e4e4a27e99b8fbf1f6 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/9770 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--tests/include.rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/include.rc b/tests/include.rc
index e7d982f7e5d..8e4e4617411 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -383,11 +383,11 @@ function cleanup()
done
killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true;
- test x"$OSTYPE" = x"NetBSD" && pkill -15 perfused || true
+ test x"$OSTYPE" = x"NetBSD" && pkill -15 perfused rpc.statd || true
# allow completion of signal handlers for SIGTERM before issue SIGKILL
sleep 1
killall -9 glusterfs glusterfsd glusterd 2>/dev/null || true;
- test x"$OSTYPE" = x"NetBSD" && pkill -9 perfused || true
+ test x"$OSTYPE" = x"NetBSD" && pkill -9 perfused rpc.statd || true
# unregister nfs and related services from portmapper/rpcbind
## nfs