From: David Zafman <dzafman@redhat.com>
Date: Fri, 24 May 2019 00:21:14 +0000 (-0700)
Subject: test: Make sure that extra scheduled scrubs don't confuse test
X-Git-Tag: v14.2.3~94^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29252%2Fhead;p=ceph.git

test: Make sure that extra scheduled scrubs don't confuse test

Fixes: http://tracker.ceph.com/issues/40078

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 893d227c822091e9d32423a1902d5f2ece7b0991)
---

diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index 4ed94fea69145..8fd02e6f5c36a 100755
--- a/qa/standalone/scrub/osd-scrub-snaps.sh
+++ b/qa/standalone/scrub/osd-scrub-snaps.sh
@@ -178,6 +178,10 @@ function TEST_scrub_snaps() {
       run_osd $dir $osd || return 1
     done
 
+    # All scrubs done manually.  Don't want any unexpected scheduled scrubs.
+    ceph osd set noscrub || return 1
+    ceph osd set nodeep-scrub || return 1
+
     # Create a pool with a single pg
     create_pool $poolname 1 1
     wait_for_clean || return 1
@@ -783,6 +787,10 @@ function _scrub_snaps_multi() {
       run_osd $dir $osd || return 1
     done
 
+    # All scrubs done manually.  Don't want any unexpected scheduled scrubs.
+    ceph osd set noscrub || return 1
+    ceph osd set nodeep-scrub || return 1
+
     # Create a pool with a single pg
     create_pool $poolname 1 1
     wait_for_clean || return 1