[fix][broker] Move newPosition to nextValidLedger:-1 to avoid cursor position and ledger inconsistency in ManagedCursorImpl#19
Open
oneby-wang wants to merge 3 commits into
Open
Conversation
665c7b1 to
eed2173
Compare
This was referenced Dec 28, 2025
91202bb to
667d3c8
Compare
667d3c8 to
5d285ee
Compare
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
Since
nextValidLedger:-1is a validmarkDeletePosition, we should move newPosition tonextValidLedger:-1to avoid cursor position and ledger inconsistency in ManagedCursorImpl whenever possible.PR apache#25087 alse made this change.
Modifications
ManagedCursorImpl.asyncMarkDelete()method, movenewPositiontonextValidLedger:-1if we reach the following conditions:a. if
lastConfirmedEntry >= newPosition, and next ledger exists, and current ledger entries are all consumed.b. if
lastConfirmedEntry < newPosition,next ledger exists, andnewPosition == nextValidLedger:-1.I think the previous code might have a little problem. If
newPosition == nextValidLedger:n, n is an non-negative number, we might set newnewPositiontonextValidLedger:nwhich is greater thanlastConfirmedEntry.https://github.com/apache/pulsar/blob/ab65faa12ab7279a726411152af44d81b6a6704b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java#L2184-L2195
And snapshot positions into a local variable to avoid race condition.
Add
testAsyncMarkDeleteMoveToNextLedgerInNonRolloverScenario,testAsyncMarkDeleteMayMoveToNextLedgerInRolloverScenario,testAsyncMarkDeleteMoveToNextLedgerOneByOne,testAsyncMarkDeleteNextLedgerMinusOneEntryIdPositiontests in to verify the code change.Fix tests due to this PR's code change.
Fix some flaky tests introduced by PR [fix][broker] Fix cursor position persistence in ledger trimming apache/pulsar#25087.
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: