HDDS-15110. Fix negative container size handling in replication#10126
Open
ptlrs wants to merge 5 commits intoapache:masterfrom
Open
HDDS-15110. Fix negative container size handling in replication#10126ptlrs wants to merge 5 commits intoapache:masterfrom
ptlrs wants to merge 5 commits intoapache:masterfrom
Conversation
| blockCount -= deletedBlockCount; | ||
| blockPendingDeletion -= processedBlockCount; | ||
| blockPendingDeletionBytes -= processedBytes; | ||
| blockBytes = Math.max(1L, blockBytes - deletedBytes); |
Contributor
There was a problem hiding this comment.
If blockBytes - deletedBytes == 0, we should not make blockBytes = 1L. If we do this then never blockBytes will become 0. Only when if there is negative value after calculation we can keep something like 1L.
Contributor
Author
|
Thanks for the review @ashishkumar50. I have update the changes. |
Contributor
|
@ptlrs newly added test is failing |
…-15110-Improve-container-size-calculation
Contributor
Author
|
@ashishkumar50 the test was failing as it depended on another PR #10130. I have updated the branch with master. |
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
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.
What changes were proposed in this pull request?
The container size is currently calculated by subtracting the deleted bytes from the existing bytes. We need to add safeguards to ensure that the calculation never results in a negative value.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-15110
How was this patch tested?
CI: https://github.com/ptlrs/ozone/actions/runs/24913951609