]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/scrub: operator abort: (not) handling in-the-mail scrubs
authorRonen Friedman <rfriedma@redhat.com>
Mon, 8 Dec 2025 15:09:30 +0000 (09:09 -0600)
committerRonen Friedman <rfriedma@redhat.com>
Wed, 21 Jan 2026 16:41:18 +0000 (16:41 +0000)
commit7fa0b1f41c8134117673361e0986b3f8860fe770
tree5eb79393493a691ea6dfaf32af8987b801952e14
parent787f81a705d55579ca2799962ad88811404b7a99
osd/scrub: operator abort: (not) handling in-the-mail scrubs

Fix on_operator_abort_scrub() to handle the case where
the operator-initiated abort request arrives while the
'start scrub' message is still in the queue (i.e. -
is_queued_or_active() is true, but is_scrub_active()
is false).

Unlike our handling of, for example, FullReset in
PrimaryIdle::clear_state(), here we choose to ignore
the request:
Considering the added complexity to the FSM versus
the minimal benefit, it is better to just ignore this
very rare case, leaving it to the operator to re-issue
the abort command if needed.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 8c409a8dd091b5ea391d8119ecc04088f4c80c8e)
src/osd/scrubber/pg_scrubber.cc