From e296775daa54814eed4ed51736a2c1092c750b21 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 21 Jul 2016 17:06:43 +0800 Subject: [PATCH] build-ceph.sh: kill lingering ceph-mon,ceph-osd this puts the changes of f23343e and e0af3d3 back. they still apply to the cmake run. this change partially reverts 934a7a3. Signed-off-by: Kefu Chai --- build-ceph.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-ceph.sh b/build-ceph.sh index 1b2e689..a9d91de 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -1,6 +1,12 @@ #!/bin/bash -x set -e -o pipefail +SECONDS=0 + +function print_runtime() { + printf "Total run time: %d:%02d\n" $((SECONDS / 60 )) $((SECONDS % 60)) +} + bindir=`dirname $0` . $bindir/reset-modules.sh @@ -14,6 +20,8 @@ OUTDIR_TMP="${OUTDIR}.tmp" install -d -m0755 -- "$OUTDIR_TMP" printf '%s\n' "$REV" >"$OUTDIR_TMP/sha1" +trap "pkill -9 'ceph-(osd|mon)' || true; print_runtime" EXIT + ./run-make-check.sh | tee $OUTDIR_TMP/run-make-check.log # we're successful, the files are ok to be published; try to be as -- 2.39.5