nautilus: osd: Cancel in-progress scrubs (not user requested)#36292
Merged
yuriw merged 4 commits intoceph:nautilusfrom Jul 28, 2020
Merged
nautilus: osd: Cancel in-progress scrubs (not user requested)#36292yuriw merged 4 commits intoceph:nautilusfrom
yuriw merged 4 commits intoceph:nautilusfrom
Conversation
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit f272768)
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit ef9ab85)
This change adds new scrubber.req_scrub to track user requested scrubs, deep_scrub or repair. Fixes: https://tracker.ceph.com/issues/46275 Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 33749cc) Conflicts: PendingReleaseNotes (trivial) src/osd/PG.cc (Due to code re-arrangement changes add manually)
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 365e48d) Conflicts: qa/standalone/scrub/osd-scrub-test.sh (The scrub/deep_scrub trigger doesn't use ceph tell)
Contributor
Author
|
jenkins test make check |
Contributor
neha-ojha
approved these changes
Jul 27, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/46706
backport of #35909
parent tracker: https://tracker.ceph.com/issues/46275
this backport was staged using ceph-backport.sh version 15.1.1.389
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh