From 893d227c822091e9d32423a1902d5f2ece7b0991 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 23 May 2019 17:21:14 -0700 Subject: [PATCH] test: Make sure that extra scheduled scrubs don't confuse test Fixes: http://tracker.ceph.com/issues/40078 Signed-off-by: David Zafman --- qa/standalone/scrub/osd-scrub-snaps.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qa/standalone/scrub/osd-scrub-snaps.sh b/qa/standalone/scrub/osd-scrub-snaps.sh index e09a551f54e..5f3bb654963 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