-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[fix][broker] Fix markDeletedPosition race condition in ManagedLedgerImpl.maybeUpdateCursorBeforeTrimmingConsumedLedger() method #25110
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
oneby-wang
wants to merge
19
commits into
apache:master
Choose a base branch
from
oneby-wang:maybeUpdateCursorBeforeTrimmingConsumedLedger_mark_delete
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+128
−41
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
…rsorBeforeTrimmingConsumedLedger
|
@oneby-wang Please add the following content to your PR description and select a checkbox: |
eed610c to
3f77d84
Compare
f0619ec to
3de1d97
Compare
a72d351 to
8a5b7d4
Compare
8a5b7d4 to
3294d78
Compare
…d testFlushCursorAfterIndividualDeleteInactivity test
…ursorLedgerFailed test
…ursorLedgerFailed test
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 operation in
ManagedLedgerImpl.maybeUpdateCursorBeforeTrimmingConsumedLedger()after #25087.Mark deleting an already mark-deleted position will throw an Exception.
Please see comment for race condition case: #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, becausepersistentMarkDeletedPositionis 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 #25117.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: oneby-wang#18