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>

diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh
index e09a551f54e1f1a33d30baa37bf1afec96ada770..5f3bb6549636a57b237b4382c255924fc478eccf 100755 (executable)
--- 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