From d5376c545ba2048c92a85bd7547e9bfebcf7d495 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Mon, 11 Apr 2016 11:45:29 +0200 Subject: [PATCH] ceph-helpers.sh: only use mon*pid files when killing MONs FreeBSD once in a while forgets to remove *pid files (this is probably a bug). But taking care of it this way is probably much in line of what is actually needs to be done Signed-off-by: Willem Jan Withagen wjw@digiware.nl --- qa/workunits/ceph-helpers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh index 0f9309147ab5..10849038c387 100755 --- a/qa/workunits/ceph-helpers.sh +++ b/qa/workunits/ceph-helpers.sh @@ -213,7 +213,8 @@ function test_kill_daemon() { ceph osd dump | grep "osd.0 down" || return 1 - for pidfile in $(find $dir -name "*.pid" 2>/dev/null) ; do + name_prefix=mon + for pidfile in $(find $dir 2>/dev/null | grep $name_prefix'[^/]*\.pid') ; do # # kill the mon and verify it cannot be reached # -- 2.47.3