]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
osd/scrub: support an operator-abort command
authorRonen Friedman <rfriedma@redhat.com>
Thu, 4 Dec 2025 14:49:29 +0000 (08:49 -0600)
committerRonen Friedman <rfriedma@redhat.com>
Wed, 21 Jan 2026 16:40:43 +0000 (16:40 +0000)
commit833d4061e7a3b51af38f7c718bbb4c15085140f1
tree24a368f3f64c0cc8e888e16a87ab6c0c0c5a0aac
parent3108aa0113028302e6f5e71524df870b066b590c
osd/scrub: support an operator-abort command

The new explicit command aborts any ongoing scrub of the target PG,
including operator-initiated scrubs. That additional capability is needed now that
operator-initiated scrubs are no longer blocked by 'no-scrub' settings.

The scenario we are trying to help the operator with is:
- an operator issues a set of operator-initiated scrubs (e.g., via a
  script), then realizes the mistake and wants to abort them all.
The abort command also downgrades the urgency level of the scrub target
(as otherwise the target would immediately restart, against the operator
wishes).

This commit implements the changes to the state machine and to the abort
logic, assuming the operator command was translated into an event.

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