Skip to content

osd/scrub: restart snap trimming only after scrubbing is done#45640

Merged
ronen-fr merged 1 commit intoceph:masterfrom
ronen-fr:wip-rf-snaptrim
Mar 26, 2022
Merged

osd/scrub: restart snap trimming only after scrubbing is done#45640
ronen-fr merged 1 commit intoceph:masterfrom
ronen-fr:wip-rf-snaptrim

Conversation

@ronen-fr
Copy link
Contributor

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

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>
@github-actions github-actions bot added the core label Mar 25, 2022
@ronen-fr ronen-fr requested review from jdurgin and neha-ojha March 25, 2022 11:54
@ronen-fr ronen-fr added bug-fix needs-quincy-backport backport required for quincy needs-pacific-backport PR needs a pacific backport labels Mar 25, 2022
Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@ronen-fr
Copy link
Contributor Author

https://pulpito.ceph.com/yuriw-2022-03-25_18:40:53-rados-wip-yuri-testing-2022-03-25-0929-distro-default-smithi/:
6 failures, 4 dead. 3 of those weren't clearly not related:

6760784:

  • the logs do not show any relevance to the PR - although I wasn't able to understand the actual problem;
  • fails on master, too

6761138:

  • the logs do not show any scrub or snap trimming relevance. Again - I wasn't able to understand what the actual problem is

6761306:

  • a failure in setting a configuration variable.

That, together with the fact that the same PR on Quincy only fails in another test, allow me to merge.

@ronen-fr ronen-fr merged commit a3bb148 into ceph:master Mar 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants