fix(prune): use saturating_sub in PruneLimiter::deleted_entries_limit_left #19535
Conversation
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
shekhirin
requested changes
Nov 6, 2025
Collaborator
shekhirin
left a comment
shekhirin
left a comment
There was a problem hiding this comment.
The change itself LGTM, can we please combine these tests into one that just checks a scenario with no saturation and with saturation?
Contributor
Author
Yes, corrected test |
shekhirin
approved these changes
Nov 6, 2025
yongkangc
pushed a commit
that referenced
this pull request
Nov 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Replace limit - deleted with limit.saturating_sub(deleted) in PruneLimiter::deleted_entries_limit_left() to prevent underflow when the deleted count exceeds the current limit (which can happen after lowering limits mid-run).
Add tests to ensure the function returns Some(0) when deleted >= limit, including after lowering the limit via both set_deleted_entries_limit() and floor_deleted_entries_limit_to_multiple_of().
This change hardens the limiter against panic/wraparound and matches the intended semantics of “remaining deletions.”