]> git.apps.os.sepia.ceph.com Git - autobuild-ceph.git/commitdiff
tarbal: kill -9 lingering ceph-mon / ceph-osd 52/head
authorLoic Dachary <ldachary@redhat.com>
Tue, 9 Jun 2015 08:46:07 +0000 (10:46 +0200)
committerLoic Dachary <ldachary@redhat.com>
Tue, 9 Jun 2015 11:55:38 +0000 (13:55 +0200)
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>
build-ceph.sh

index f8751255445776755af359caaee91764932d133e..d7b41770f3371ea87dfa73eb03d7fb3ae3d56f37 100755 (executable)
@@ -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 .