]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: restart snap trimming only after scrubbing is done 45641/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 12:03:11 +0000 (12:03 +0000)
commit139af5ea19775f95160774432fd957e87d0965c0
treedeb214955ceee732abc73651f688111c3a6696cf
parent6d2b27c4d6142be8029a725eefa0440cedb7a660
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>
(cherry picked from commit 948d3266c67bf896d1c20472977b849178d233d3)
src/osd/PrimaryLogPG.cc
src/osd/scrubber/pg_scrubber.cc