From: David Zafman <dzafman@redhat.com>
Date: Wed, 24 Apr 2019 03:26:22 +0000 (-0700)
Subject: test: osd-recovery-scrub.sh ignore error from kill_daemons()
X-Git-Tag: v15.1.0~2828^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=71d254647ac2019c6973bd58649dbb242651ca7c;p=ceph-ci.git

test: osd-recovery-scrub.sh ignore error from kill_daemons()

Another work around for http://tracker.ceph.com/issues/38195

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-recovery-scrub.sh b/qa/standalone/scrub/osd-recovery-scrub.sh
index 0e8c432107a..965efa41ec3 100755
--- a/qa/standalone/scrub/osd-recovery-scrub.sh
+++ b/qa/standalone/scrub/osd-recovery-scrub.sh
@@ -83,7 +83,8 @@ function TEST_recovery_scrub() {
         ERRORS=$(expr $ERRORS + 1)
     fi
 
-    kill_daemons $dir || return 1
+    # Work around for http://tracker.ceph.com/issues/38195
+    kill_daemons $dir #|| return 1
 
     declare -a err_strings
     err_strings[0]="not scheduling scrubs due to active recovery"