]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/scrub: abort reserving scrub if an operator-initiated scrub is
authorRonen Friedman <rfriedma@redhat.com>
Thu, 19 Dec 2024 16:02:08 +0000 (10:02 -0600)
committerRonen Friedman <rfriedma@redhat.com>
Sun, 29 Dec 2024 11:31:57 +0000 (05:31 -0600)
commitd3194eaf2572a41b0dfa064e5b984137eb5209fb
tree76bbc9e0d335f0063bceed89adf7fcabccfcb8aa
parentab5c5d7d1d7b600729269f19a9c61277fad84de0
osd/scrub: abort reserving scrub if an operator-initiated scrub is
requested

Handling the case of receiving an operator command while the PG is
scrubbing, but
is waiting for replicas' reservations:

Now that the reservations are queued, the wait may be a very prolonged
one.
Usually - an operator direct scrub command has a priority high enough
to not require waiting for reservations. But in the current
implementation,
it would wait until the running scrub session terminates, and only then
will rerun at that high priority. This is not the intended behavior.

The solution is to abort the existing scrub session, and start the new
one.

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