From f5f35b421fb7b1c10ee702f25581aa233ae39ee2 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 23 Apr 2019 20:26:22 -0700 Subject: [PATCH] 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 (cherry picked from commit 71d254647ac2019c6973bd58649dbb242651ca7c) --- qa/standalone/scrub/osd-recovery-scrub.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/standalone/scrub/osd-recovery-scrub.sh b/qa/standalone/scrub/osd-recovery-scrub.sh index 0e8c432107ae4..965efa41ec3ea 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" -- 2.39.5