]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: restart snap trimming after a failed scrub 46320/head
authorRonen Friedman <rfriedma@redhat.com>
Tue, 17 May 2022 16:13:59 +0000 (16:13 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Mon, 30 May 2022 14:35:38 +0000 (14:35 +0000)
commit290e744a9b6c64f3da805056625b963f0eedaf33
treedab83f49e0d2904c35ebe1ce581d7e6ca6960ad8
parent4cb6436d6792cc8e82914ac141020746687bcd62
osd/scrub: restart snap trimming after a failed scrub

A followup to PR#45640.
In PR#45640 snap trimming was restarted (if blocked) after all
successful scrubs, and after most scrub failures. Still, a few
failure scenarios did not handle snaptrim restart correctly.

The current PR cleans up and fixes the interaction between
scrub initiation/termination (for whatever cause) and snap
trimming.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
src/osd/PG.cc
src/osd/scrubber/pg_scrubber.cc
src/osd/scrubber/pg_scrubber.h
src/osd/scrubber_common.h