Skip to content

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

Merged
yuriw merged 1 commit intoceph:pacificfrom
ronen-fr:wip-rf-45640-pacific
Apr 7, 2022
Merged

pacific: osd/scrub: restart snap trimming only after scrubbing is done#45785
yuriw merged 1 commit intoceph:pacificfrom
ronen-fr:wip-rf-45640-pacific

Conversation

@ronen-fr
Copy link
Contributor

@ronen-fr ronen-fr commented Apr 5, 2022

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
(cherry picked from commit 948d326)

Conflicts:
src/osd/pg_scrubber.cc

Conflict resolved by removing a clear_queued_or_active() call that
was dragged in.

@ronen-fr
pacific: osd/scrub: restart snap trimming only after scrubbing is done
b010892 
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>
(cherry picked from commit 948d326)

Conflicts:
	src/osd/pg_scrubber.cc

Conflict resolved by removing a clear_queued_or_active() call that
was dragged in.
@github-actions github-actions bot added the core label Apr 5, 2022
@github-actions github-actions bot added this to the pacific milestone Apr 5, 2022
@neha-ojha neha-ojha self-requested a review April 5, 2022 20:00
@ronen-fr
Copy link
Contributor Author

ronen-fr commented Apr 6, 2022

100 Teuthology tests OK: http://pulpito.front.sepia.ceph.com/?branch=wip-rf-45640-pacific

@ljflores
Copy link
Member

ljflores commented Apr 6, 2022

jenkins test api

@ljflores
Copy link
Member

ljflores commented Apr 7, 2022

http://pulpito.front.sepia.ceph.com/yuriw-2022-04-06_14:02:46-rados-wip-yuri4-testing-2022-04-05-1720-pacific-distro-default-smithi/
http://pulpito.front.sepia.ceph.com/lflores-2022-04-07_18:45:23-rados-wip-yuri4-testing-2022-04-05-1720-pacific-distro-default-smithi/

Failures, unrelated:
https://tracker.ceph.com/issues/53501
https://tracker.ceph.com/issues/49287
https://tracker.ceph.com/issues/54071
https://tracker.ceph.com/issues/54086

There were also some selinux denials in several cephadm tests.

Details:
1. Exception when running 'rook' task. - Ceph - Orchestrator
2. podman: setting cgroup config for procHooks process caused: Unit libpod-$hash.scope not found - Ceph - Orchestrator
3. rados/cephadm/osds: Invalid command: missing required parameter hostname() - Ceph - Orchestrator
4. Permission denied when trying to unlink and open /var/log/ntpstats/... - Tools - Teuthology

@ljflores
Copy link
Member

ljflores commented Apr 7, 2022

jenkns test api

@ljflores
Copy link
Member

ljflores commented Apr 7, 2022

jenkins test api

@yuriw yuriw merged commit adbb229 into ceph:pacific Apr 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@neha-ojha neha-ojha neha-ojha approved these changes

Assignees

No one assigned

Labels

core needs-qa wip-yuri4-testing

Projects

None yet

Milestone

pacific

Development

Successfully merging this pull request may close these issues.

4 participants

@ronen-fr @ljflores @neha-ojha @yuriw