RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-05-06 17:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28302 from dzafman/wip-40078

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
David Zafman 2019-06-05 14:43:30 -07:00 committed by GitHub
commit 590b4138ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qa/standalone/scrub/osd-scrub-snaps.sh
View File

@ -178,6 +178,10 @@ function TEST_scrub_snaps() {
run_osd $dir $osd || return 1 run_osd $dir $osd || return 1
done 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 a pool with a single pg
create_pool $poolname 1 1 create_pool $poolname 1 1
wait_for_clean || return 1 wait_for_clean || return 1
@ -783,6 +787,10 @@ function _scrub_snaps_multi() {
run_osd $dir $osd || return 1 run_osd $dir $osd || return 1
done 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 a pool with a single pg
create_pool $poolname 1 1 create_pool $poolname 1 1
wait_for_clean || return 1 wait_for_clean || return 1