gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #69110 from ronen-fr/wip-rf-hours

Browse Source 
osd/scrub: 'repairing' scrubs allowed at all times

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Ronen Friedman 2026-05-29 07:00:00 +03:00 committed by GitHub
commit ce220cc902
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osd/scrubber/scrub_job.cc
View File

@ -376,7 +376,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)

6
src/osd/scrubber/scrub_job.h
View File

@ -306,8 +306,6 @@ class ScrubJob {
* Some types of scrubs are exempt from some or all of the preconditions and
* limitations that apply to regular scrubs. The following table
* details the specific set of exemptions per 'urgency' level:
* (note: regular scrubs that are overdue are also allowed a specific
* set of exemptions. Those will be covered elsewhere).
*
* The relevant limitations are:
* - reservation: the scrub must reserve replicas;
@ -337,8 +335,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 X | 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 |
* | trims | yes | yes | no | no | no |