[fix][ml] Fix cursor backlog size to account for individual acks #25089
+138
−1
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
Fixes the issue where cursor.getEstimatedSizeSinceMarkDeletePosition() would not subtract the size of individually acknowledged messages. Problem: - When messages are acknowledged out of order using asyncDelete(), the backlog count correctly decreases - But the backlog size remains inflated because individualDeletedMessages are not accounted for Example: - 5 messages (500 bytes total) - Individual ack of 3 messages - Before fix: backlog size = 500 (incorrect) - After fix: backlog size = 200 (correct) Fix: - Update ManagedCursorImpl.getEstimatedSizeSinceMarkDeletePosition() to calculate and subtract size of individual deleted entries - Uses average entry size to estimate deleted size - Thread-safe with proper locking Unit test: - testEstimatedSizeWithIndividualAcks() verifies the fix
codelipenghui
added
ready-to-test
and removed
doc-not-needed
Contributor
Author
|
/pulsarbot run-failure-checks |
Fixes line 1324 (127 char) and line 1342 (136 char) to be under 120 characters]
Technoboy-
approved these changes
Dec 19, 2025
poorbarcode
approved these changes
Dec 23, 2025
coderzc
approved these changes
Dec 23, 2025
lhotari
reviewed
Dec 23, 2025
Member
lhotari
left a comment
lhotari
left a comment
There was a problem hiding this comment.
Please check the comment about avoiding code duplication
Comment on lines
+1293
to
+1317
| // Get count of individually deleted entries in the backlog range | ||
| long deletedCount = 0; | ||
| lock.readLock().lock(); | ||
| try { | ||
| Range<Position> backlogRange = Range.openClosed(markDeletePosition, ledger.getLastPosition()); | ||
|
|
||
| if (getConfig().isUnackedRangesOpenCacheSetEnabled()) { | ||
| deletedCount = individualDeletedMessages.cardinality( | ||
| backlogRange.lowerEndpoint().getLedgerId(), backlogRange.lowerEndpoint().getEntryId(), | ||
| backlogRange.upperEndpoint().getLedgerId(), backlogRange.upperEndpoint().getEntryId()); | ||
| } else { | ||
| AtomicLong deletedCounter = new AtomicLong(0); | ||
| individualDeletedMessages.forEach((r) -> { | ||
| if (r.isConnected(backlogRange)) { | ||
| Range<Position> intersection = r.intersection(backlogRange); | ||
| long countInRange = ledger.getNumberOfEntries(intersection); | ||
| deletedCounter.addAndGet(countInRange); | ||
| } | ||
| return true; | ||
| }, recyclePositionRangeConverter); | ||
| deletedCount = deletedCounter.get(); | ||
| } | ||
| } finally { | ||
| lock.readLock().unlock(); | ||
| } |
Member
There was a problem hiding this comment.
This part seems to duplicate logic that currently exists in getNumberOfEntries method. Avoiding code duplication would be preferred. Would it be possible to extract a common method that is used in both getEstimatedSizeSinceMarkDeletePosition and getNumberOfEntries?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Fixes the issue where cursor.getEstimatedSizeSinceMarkDeletePosition() would not subtract the size of individually acknowledged messages.
Problem:
Example:
Fix:
Unit test:
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-complete