HDDS-16143. Fix durable deleted-block summary undercount from unguarded flush() - #11187
Open
priyeshkaratha wants to merge 1 commit into
Open
HDDS-16143. Fix durable deleted-block summary undercount from unguarded flush()#11187priyeshkaratha wants to merge 1 commit into
priyeshkaratha wants to merge 1 commit into
Conversation
priyeshkaratha
marked this pull request as ready for review
September 2, 2026 08:39
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
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?
DeletedBlockLogStateManagerImpl.addTransactionsToDBandremoveTransactionsFromDBbuffer a transaction row and its updatedDeletedBlocksTransactionSummaryas two separatetransactionBuffercalls.SCMStateMachine.notifyLeaderChangedcallstransactionBuffer.flush()without theapplyingTransactionsguard thatflushIfNeededuses, so a leader change can fire between the row buffer call and the summary buffer call, committing the transaction row to RocksDB without the matching summary update.SCMDeletedBlockTransactionStatusManager.onBecomeLeaderthen callsinitDataDistributionData, which reloads the now-stale (pre-apply) summary from the inconsistent durable state into the in-memory counters,overwriting the correct in-memory value. The undercount is permanent — it isn't self-healed by a later flush, only by an SCM restart that reads a subsequent consistent checkpoint.
Add
SCMHADBTransactionBuffer#runWithBufferLock(CheckedRunnable). It holds the buffer's shared read lock for the duration of the operation; sinceflush()takes the write lock, it cannot commit a partialrow+summary batch in the middle of the operation (nested
addToBuffer/removeFromBuffercalls re-enter the read lock, whichReentrantReadWriteLockpermits).DeletedBlockLogStateManagerImplwraps the row and summary buffering in bothaddTransactionsToDBandremoveTransactionsFromDBin this call, making each a flush-atomic unit.Implemented for both
SCMHADBTransactionBufferImplandSCMHADBTransactionBufferStub.What is the link to the Apache JIRA
HDDS-16143
How was this patch tested?
Added new testcases.