[fix][broker] Fix markDeletedPosition race condition in ManagedLedgerImpl.maybeUpdateCursorBeforeTrimmingConsumedLedger() method - #18
Closed
oneby-wang wants to merge 28 commits into
Conversation
15 tasks
oneby-wang
force-pushed
the
maybeUpdateCursorBeforeTrimmingConsumedLedger_mark_delete
branch
5 times, most recently
from
December 29, 2025 01:40
bbc81d2 to
3569bde
Compare
oneby-wang
force-pushed
the
maybeUpdateCursorBeforeTrimmingConsumedLedger_mark_delete
branch
from
January 8, 2026 15:30
daa66dc to
0f89953
Compare
…rsorBeforeTrimmingConsumedLedger
…d testFlushCursorAfterIndividualDeleteInactivity test
…ursorLedgerFailed test
…ursorLedgerFailed test
…erties in ManagedLedgerTest.testTrimmerRaceCondition
…Impl.internalAsyncMarkDelete
oneby-wang
force-pushed
the
maybeUpdateCursorBeforeTrimmingConsumedLedger_mark_delete
branch
from
January 9, 2026 05:59
afdba8a to
bd62af6
Compare
…eleteEntryToLatest, add test
…onWithThrottleMarkDeleteInDurableCursor
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.
Motivation
We do mark deleting operations in
ManagedLedgerImpl.maybeUpdateCursorBeforeTrimmingConsumedLedger()after apache#25087.Mark deleting an already mark-deleted position will throw an Exception.
Please see comment for race condition case: apache#25101 (comment).
See also:
Modifications
Modify
ManagedLedgerImpl.maybeUpdateCursorBeforeTrimmingConsumedLedger()method:a. snapshot positions into a local variable to avoid race condition.
b. use
markDeletePositioninstead ofpersistentMarkDeletedPositionto setlastAckedPosition, becausepersistentMarkDeletedPositionif updated aftermarkDeletePosition.c. add if check logic to avoid mark deleting an already mark-deleted position.
d. wait
maybeUpdateCursorBeforeTrimmingConsumedLedger()completed when opening ledger.e. move
maybeUpdateCursorBeforeTrimmingConsumedLedger()into synchronized block when creating a new ledger. I think new ledger's initialization work should be completed before the first entry is added to this ledger.Modify
ManagedCursorImpl.getNumberOfEntries()method: snapshot positions into a local variable to avoid race condition, error logs like this:Ignore changes in
ManagedCursorImpl.asyncMarkDelete()method, I just snapshot positions into a local variable to avoid race condition. It should be fixed by: [fix][broker] Move newPosition to nextValidLedger:-1 to avoid cursor position and ledger inconsistency in ManagedCursorImpl #19.Add
testNeverThrowsMarkDeletingMarkedPositionInMaybeUpdateCursorBeforeTrimmingConsumedLedgertest inManagedLedgerImplTestto verify the code change.Fix tests due to this PR's code change.
Verifying this change
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
docdoc-requireddoc-not-neededdoc-completeMatching PR in forked repository
PR in forked repository: