]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/scrub: fix job requeue conditions 58173/head
authorRonen Friedman <rfriedma@redhat.com>
Wed, 10 Jul 2024 07:06:09 +0000 (02:06 -0500)
committerRonen Friedman <rfriedma@redhat.com>
Tue, 16 Jul 2024 14:19:33 +0000 (09:19 -0500)
commit699dd28ad5cce9149e48c81811a54bb23f04a088
tree55346e201226f4d9365a7dadf7bbee2ea83cdf9b
parent2187c494a66cb37f1e69529c0e3400a80e2b2782
osd/scrub: fix job requeue conditions

Previous commits handled the following two cases correctly:
- requeueing a scrub job while the OSD is still the primary, and
- not restoring the scrub job to the queue if the PG is not there;
Here we handle the missed scenario: the PG is there (we were able to
lock it), but is no longer the primary.

Also - a configuration change must not cause a re-queue of a
scrub-job for a PG that is in the middle of scrubbing.

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