osd/scrub: restart snap trimming only after scrubbing is done#45640
Merged
ronen-fr merged 1 commit intoceph:masterfrom Mar 26, 2022
Merged
osd/scrub: restart snap trimming only after scrubbing is done#45640ronen-fr merged 1 commit intoceph:masterfrom
ronen-fr merged 1 commit intoceph:masterfrom
Conversation
Snap trimming that was postponed as the target PG was scrubbing must be restarted at scrub completion. PR ceph#38111 moved trimming restart to just before the scrub fully terminated. The current PR fixes that. Trimming is also restarted in those cases where scrub was queued but aborted immediately. Fixes: https://tracker.ceph.com/issues/52026 Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
jdurgin
approved these changes
Mar 25, 2022
Member
jdurgin
left a comment
There was a problem hiding this comment.
Looks good! Would be great to have a test that makes sure we have snaptrim + scrub attempting to run at the same time. Could be a follow-on PR since it may be complex to orchestrate.
Contributor
Author
|
https://pulpito.ceph.com/yuriw-2022-03-25_18:40:53-rados-wip-yuri-testing-2022-03-25-0929-distro-default-smithi/: 6760784:
6761138:
6761306:
That, together with the fact that the same PR on Quincy only fails in another test, allow me to merge. |
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
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.
Snap trimming that was postponed as the target PG was scrubbing
must be restarted at scrub completion.
PR #38111 moved trimming restart to just before the scrub fully
terminated. The current PR fixes that.
Trimming is also restarted in those cases where scrub was
queued but aborted immediately.
Fixes: https://tracker.ceph.com/issues/52026
Signed-off-by: Ronen Friedman rfriedma@redhat.com