]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
pacific: osd/scrub: restart snap trimming only after scrubbing is done 45785/head
authorRonen Friedman <rfriedma@redhat.com>
Fri, 25 Mar 2022 10:45:47 +0000 (10:45 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Tue, 5 Apr 2022 17:57:39 +0000 (20:57 +0300)
commitb010892d30750e48810a64a87cb9ef542006d293
tree951c4642728432c6b3706efabd4c42999ac40894
parent211e418d9d937b9a5683469cab535b5f42465f98
pacific: 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)

Conflicts:
src/osd/pg_scrubber.cc

Conflict resolved by removing a clear_queued_or_active() call that
was dragged in.
src/osd/PrimaryLogPG.cc
src/osd/pg_scrubber.cc