From cca541d0f9a945a3e3ae2247bab238d7d4cea335 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 5 Dec 2019 09:48:09 -0800 Subject: [PATCH] test: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub Fixes: https://tracker.ceph.com/issues/43150 Signed-off-by: David Zafman --- qa/standalone/scrub/osd-scrub-snaps.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index b37671024ee..3f84a8b077e 100755 --- a/qa/standalone/scrub/osd-scrub-snaps.sh +++ b/qa/standalone/scrub/osd-scrub-snaps.sh @@ -201,9 +201,11 @@ function TEST_scrub_snaps() { for osd in $(seq 0 $(expr $OSDS - 1)) do - run_osd $dir $osd || return 1 + activate_osd $dir $osd || return 1 done + wait_for_clean || return 1 + local pgid="${poolid}.0" if ! pg_scrub "$pgid" ; then return 1 @@ -750,9 +752,11 @@ function _scrub_snaps_multi() { for osd in $(seq 0 $(expr $OSDS - 1)) do - run_osd $dir $osd || return 1 + activate_osd $dir $osd || return 1 done + wait_for_clean || return 1 + local pgid="${poolid}.0" if ! pg_scrub "$pgid" ; then return 1 -- 2.39.5