tentacle: osd/scrub: 'repairing' scrubs allowed at all times - #69160
Merged
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Automated Backport Parity Review - Backport Deviation Alert
A conflict or unapproved deviation was detected during the simulation of this backport. The code in this PR does not match a clean cherry-pick of the upstream commits.
Deviation in Backport e94c170 (cherry-pick of 4ac5a32)
Affected File(s)
src/osd/scrubber/scrub_job.h
Range Diff
Click to expand
--- Original (4ac5a321)
+++ Backport (e94c1700)
@@ -7,3 +7,5 @@
Fixes: https://tracker.ceph.com/issues/76811
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
+(cherry picked from commit 4ac5a3210ae55e33466ca867a8c1c4b5b0a18c64)
+Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
================================================================================
RANGE DIFF
================================================================================
1: 4ac5a3210ae ! 1: e94c1700554 osd/scrub: 'repairing' scrubs allowed at all times
@@ Commit message
Fixes: https://tracker.ceph.com/issues/76811
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
+ (cherry picked from commit 4ac5a3210ae55e33466ca867a8c1c4b5b0a18c64)
+ Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
## src/osd/scrubber/scrub_job.cc ##
@@ src/osd/scrubber/scrub_job.cc: bool ScrubJob::observes_noscrub_flags(urgency_t urgency)
@@ src/osd/scrubber/scrub_job.h: 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 |
+ * | 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 |
+ * | noscrub | yes | no | Yes | no | no |How to proceed:
- Authors (Genuine Conflicts): If this is a genuine conflict requiring manual resolution, ensure your resolution is correct. You must explain the conflict resolution in the commit message (e.g., leave the standard Git
Conflicts:block intact) and include an explanation for changes. - Authors (Need Help?): Reach out to the Component Lead for technical guidance on complex code conflicts.
- Component Leads (Review): Please review the Range Diff(s) above to verify the author's manual conflict resolution is correct for this release branch. If the deviation is intentional, documented, and approved then the component lead or @ceph/ceph-release-manager can bypass this check by commenting
/audit override.
Be familiar with the rules and guidelines for writing backports.
Automated Redmine Linkage Audit
The following tracking irregularities were found:
- Missing Backport Tracker: Main tracker #76811 does not have a backport tracker for
tentacle. Please adjust the 'Backports' field on the main tracker appropriately and remove 'backport_processed' from 'Tags (freeform)'.
Commit Parity Visualizer
| BACKPORT PR #69160 | SOURCE PR | SOURCE STATUS |
|---|---|---|
| e94c170 osd/scrub: 'repairing' scrubs allowed at all times | PR #69110 | 4ac5a32 osd/scrub: 'repairing' scrubs allowed at all times |
| e5379b0 osd/scrub: removed a misleading comment about 'overdue' scrubs | 787f2b0 osd/scrub: removed a misleading comment about 'overdue' scrubs |
🛟 Need Help?
If you need technical help resolving these issues, please consult with the Component Lead. If you need administrative overrides, please see the #ceph-upstream-releases channel on Slack and request a review from the @ceph/ceph-release-manager.
📋 Component Lead / Release Manager
To override the audit failure, apply releng-audit-override label or comment /audit override.
When you are ready for a new audit, please remove the releng-audit-fail label or comment /audit retest.
CI Run Log: View Workflow Details
github-actions
Bot
added
the
releng-audit-fail
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 <rfriedma@redhat.com> (cherry picked from commit 4ac5a32) CONFLICT (content): Merge conflict in src/osd/scrubber/scrub_job.h Resolved manually (comment lines only) Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
Signed-off-by: Ronen Friedman <rfriedma@redhat.com> (cherry picked from commit 787f2b0)
ronen-fr
force-pushed
the
wip-rf-69110b-tentacle
branch
from
June 3, 2026 13:44
e5379b0 to
ba71d31
Compare
ronen-fr
removed
the
releng-audit-fail
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
github-actions
Bot
added
the
releng-audit-fail
ronen-fr
marked this pull request as ready for review
June 3, 2026 14:59
rzarzynski
approved these changes
Jun 3, 2026
Contributor
|
RADOS Approved. |
batrick
removed
the
releng-audit-fail
There was a problem hiding this comment.
Automated Backport Parity Review - Backport Deviation Alert
A conflict or unapproved deviation was detected during the simulation of this backport. The code in this PR does not match a clean cherry-pick of the upstream commits.
Deviation in Backport 53e4793 (cherry-pick of 4ac5a32)
Affected File(s)
src/osd/scrubber/scrub_job.h
Range Diff
Click to expand
--- Original (4ac5a321)
+++ Backport (53e4793d)
@@ -7,3 +7,7 @@
Fixes: https://tracker.ceph.com/issues/76811
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
+(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 <rfriedma@redhat.com>
================================================================================
RANGE DIFF
================================================================================
1: 4ac5a3210ae ! 1: 53e4793dbd8 osd/scrub: 'repairing' scrubs allowed at all times
@@ Commit message
Fixes: https://tracker.ceph.com/issues/76811
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
+ (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 <rfriedma@redhat.com>
## src/osd/scrubber/scrub_job.cc ##
@@ src/osd/scrubber/scrub_job.cc: bool ScrubJob::observes_noscrub_flags(urgency_t urgency)
@@ src/osd/scrubber/scrub_job.h: 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 |
+ * | 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 |
+ * | noscrub | yes | no | Yes | no | no |How to proceed:
- Authors (Genuine Conflicts): If this is a genuine conflict requiring manual resolution, ensure your resolution is correct. You must explain the conflict resolution in the commit message (e.g., leave the standard Git
Conflicts:block intact) and include an explanation for changes. - Authors (Need Help?): Reach out to the Component Lead for technical guidance on complex code conflicts.
- Component Leads (Review): Please review the Range Diff(s) above to verify the author's manual conflict resolution is correct for this release branch. If the deviation is intentional, documented, and approved then the component lead or @ceph/ceph-release-manager can bypass this check by commenting
/audit override.
Be familiar with the rules and guidelines for writing backports.
Commit Parity Visualizer
| BACKPORT PR #69160 | SOURCE PR | SOURCE STATUS |
|---|---|---|
| 53e4793 osd/scrub: 'repairing' scrubs allowed at all times | PR #69110 | 4ac5a32 osd/scrub: 'repairing' scrubs allowed at all times |
| ba71d31 osd/scrub: removed a misleading comment about 'overdue' scrubs | 787f2b0 osd/scrub: removed a misleading comment about 'overdue' scrubs |
🛟 Need Help?
If you need technical help resolving these issues, please consult with the Component Lead. If you need administrative overrides, please see the #ceph-upstream-releases channel on Slack and request a review from the @ceph/ceph-release-manager.
📋 Component Lead / Release Manager
To override the audit failure, apply releng-audit-override label or comment /audit override.
When you are ready for a new audit, please remove the releng-audit-fail label or comment /audit retest.
CI Run Log: View Workflow Details
github-actions
Bot
added
the
releng-audit-fail
github-actions
Bot
removed
the
releng-audit-fail
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.
Backport of #69110
Fixes: https://tracker.ceph.com/issues/77025
Original tracker: https://tracker.ceph.com/issues/76811