From: Ronen Friedman Date: Tue, 26 May 2026 15:29:32 +0000 (+0000) Subject: osd/scrub: 'repairing' scrubs allowed at all times X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53e4793dbd8426e06c73f273817bdc371e4b0bc8;p=ceph.git osd/scrub: 'repairing' scrubs allowed at all times Fix ScrubJob::observes_allowed_hours() to not block 'repairing' scrubs outside of the allowed hours. This allows repair scrubs to run at any time or day-of-week. The fixed behaviour matches the documented requirements. Fixes: https://tracker.ceph.com/issues/76811 Signed-off-by: Ronen Friedman (cherry picked from commit 4ac5a3210ae55e33466ca867a8c1c4b5b0a18c64) CONFLICT (content): Merge conflict in src/osd/scrubber/scrub_job.h Resolved manually (comment lines only) Signed-off-by: Ronen Friedman --- diff --git a/src/osd/scrubber/scrub_job.cc b/src/osd/scrubber/scrub_job.cc index 81f45ffca80..e4f34713bce 100644 --- a/src/osd/scrubber/scrub_job.cc +++ b/src/osd/scrubber/scrub_job.cc @@ -371,7 +371,7 @@ bool ScrubJob::observes_noscrub_flags(urgency_t urgency) bool ScrubJob::observes_allowed_hours(urgency_t urgency) { - return urgency < urgency_t::operator_requested; + return urgency < urgency_t::repairing; } bool ScrubJob::observes_extended_sleep(urgency_t urgency) diff --git a/src/osd/scrubber/scrub_job.h b/src/osd/scrubber/scrub_job.h index 3aef5a874a4..b1d3d9c1904 100644 --- a/src/osd/scrubber/scrub_job.h +++ b/src/osd/scrubber/scrub_job.h @@ -336,8 +336,8 @@ class ScrubJob { * | limitation | must- | after-repair |repairing| operator | must-repair | * | | scrub |(aft recovery)|(errors) | request | | * +------------+---------+--------------+---------+----------+-------------+ - * | reservation| yes! | no | no? | no | no | - * | dow/time | yes | yes | no | no | no | + * | reservation| yes | no | no | no | no | + * | dow/time | yes | yes | no | no | no | * | ext-sleep | no | no | no | no | no | * | load | yes | no | no | no | no | * | noscrub | yes | no | Yes | no | no |