From: David Zafman <dzafman@redhat.com>
Date: Thu, 5 Dec 2019 17:48:09 +0000 (-0800)
Subject: test: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub
X-Git-Tag: v15.1.0~622^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cca541d0f9a945a3e3ae2247bab238d7d4cea335;p=ceph.git

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 <dzafman@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index b37671024eeb..3f84a8b077ec 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