]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: restart snap trimming only after scrubbing is done 45640/head
authorRonen Friedman <rfriedma@redhat.com>
Fri, 25 Mar 2022 10:45:47 +0000 (10:45 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Fri, 25 Mar 2022 11:49:51 +0000 (11:49 +0000)
commit948d3266c67bf896d1c20472977b849178d233d3
treebe949b92dc119812f50b5ede92af57412c551772
parent502ce262fff191af2570d79208ae7353d8116297
osd/scrub: restart snap trimming only after scrubbing is done

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>
src/osd/PrimaryLogPG.cc
src/osd/scrubber/pg_scrubber.cc