]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: restart snap trimming after a failed scrub 46418/head
authorRonen Friedman <rfriedma@redhat.com>
Tue, 17 May 2022 16:13:59 +0000 (16:13 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Wed, 1 Jun 2022 17:47:47 +0000 (17:47 +0000)
commit47933f540b0272ef29e35fc90568da46773eb87b
tree7b059b226450053ec83db738c9a786a9a6ed805f
parent7d5fe31a530fe6cfdad42a875e11a1ed21a1c61c
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>
(cherry picked from commit 290e744a9b6c64f3da805056625b963f0eedaf33)
src/osd/PG.cc
src/osd/scrubber/pg_scrubber.cc
src/osd/scrubber/pg_scrubber.h
src/osd/scrubber_common.h