From 97de817ad1c253ee1c7c9c9302981ad2435301b9 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Thu, 17 Jul 2025 11:59:00 -0500 Subject: [PATCH] osd/scrub: allow auto-repair on operator-initiated scrubs Previously, operator-initiated scrubs would not auto-repair, regardless of the value of the 'osd_scrub_auto_repair' config option. This was less confusing to the operator than it could have been, as most operator commands would in fact cause a regular periodic scrub to be initiated. However, that quirk is now fixed: operator commands now trigger 'op-initiated' scrubs. Thus the need for this patch. The original bug was fixed in https://github.com/ceph/ceph/pull/54615, but was unfortunately re-introduced later on. Fixes: https://tracker.ceph.com/issues/72178 Signed-off-by: Ronen Friedman --- src/osd/scrubber/scrub_job.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osd/scrubber/scrub_job.cc b/src/osd/scrubber/scrub_job.cc index 77dcb44efa6..da9cbb01820 100644 --- a/src/osd/scrubber/scrub_job.cc +++ b/src/osd/scrubber/scrub_job.cc @@ -423,5 +423,6 @@ bool ScrubJob::is_autorepair_allowed(urgency_t urgency) { // note: 'after-repair' scrubs are not allowed to auto-repair return urgency == urgency_t::periodic_regular || + urgency == urgency_t::operator_requested || urgency == urgency_t::repairing || urgency == urgency_t::must_repair; } -- 2.39.5