[fix][broker] Decrement unacked counter when removeAllUpTo removes pending acks - #25581
Merged
Merged
Conversation
lhotari
approved these changes
Apr 27, 2026
lhotari
reviewed
Apr 27, 2026
lhotari
approved these changes
Apr 27, 2026
poorbarcode
pushed a commit
to poorbarcode/pulsar
that referenced
this pull request
May 6, 2026
Technoboy-
pushed a commit
that referenced
this pull request
May 11, 2026
coderzc
pushed a commit
that referenced
this pull request
May 13, 2026
nodece
added a commit
to ascentstream/pulsar
that referenced
this pull request
May 27, 2026
priyanshu-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Jun 9, 2026
…nding acks (apache#25581) (cherry picked from commit 22637ef)
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
4 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.
Motivation
When the cursor's mark-delete position advances (e.g., via message expiry),
readMoreEntriescallsPendingAcksMap.removeAllUpToto remove entries from the consumer's pendingAcks without decrementing the consumer'sunackedMessagescounter, causing it to be permanently inflated.This is especially problematic with batch index level ack enabled: partial acks leave residual unacked counts in the counter, and after
removeAllUpToremoves the entry from pendingAcks, subsequent individual batch acks can no longer find the entry to decrement, so the counter never reaches zero.Modifications
PendingAcksMap.removeAllUpToaccepts a callback invoked per removed entryConsumer. removePendingAcksUpToPositionAndDecrementUnackedcomputes the remaining unacked count per entry (respecting batch index level ack) and decrements the counterPersistentDispatcherMultipleConsumers.readMoreEntriesuses the new method instead of directly callingremoveAllUpTo