From b5dffca892b3b94f4bccab51a7a48fbbf05bd718 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 9 Jun 2015 14:40:38 +0200 Subject: [PATCH] tarball: kill -9 ceph-mon / ceph-osd always succeed The error code of kill -9 ceph-{mon,osd} must be ignored otherwise the build may return on error if it fails to kill the process just because all has been cleaned up as it should. http://tracker.ceph.com/issues/11929 Fixes: #11929 Signed-off-by: Loic Dachary --- build-ceph.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ceph.sh b/build-ceph.sh index d7b4177..7f121ea 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 -9 ceph-osd ; pkill -9 ceph-mon" EXIT +trap "pkill -9 ceph-osd || true ; pkill -9 ceph-mon || true" EXIT if ! ../maxtime 3600 make $(maybe_parallel_make_check) check "$@" ; then display_failures . -- 2.39.5