]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.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>
Tue, 20 Jan 2026 16:40:03 +0000 (16:40 +0000)
commitd24a02f67a26f1bf8f13efffe2fa213c744f096f
treef44ea32839a9ef86d920f13ab198cfb9fb9d4ea7
parentd51c228883ddddce87d227b78f9377bffd28dd59
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>
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