From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 9 Jun 2015 08:46:07 +0000 (+0200)
Subject: tarbal: kill -9 lingering ceph-mon / ceph-osd
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3829f60b23d9914841aa659b60e1910ea104de98;p=autobuild-ceph.git

tarbal: kill -9 lingering ceph-mon / ceph-osd

be more agressive about killing ceph-mon / ceph-osd as they may be
unresponsive when / if there is a bug.

http://tracker.ceph.com/issues/11929 Fixes: #11929

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/build-ceph.sh b/build-ceph.sh
index f875125..d7b4177 100755
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -88,7 +88,7 @@ make -j$(get_processors) "$@" || exit 4
 
 # run "make check", but give it a time limit in case a test gets stuck
 
-trap "pkill ceph-osd ; pkill ceph-mon" EXIT
+trap "pkill -9 ceph-osd ; pkill -9 ceph-mon" EXIT
 
 if ! ../maxtime 3600 make $(maybe_parallel_make_check) check "$@" ; then
     display_failures .