[fix][broker] Fix BucketDelayedDeliveryTracker recovery after LightProto migration#26160
Merged
nodece merged 2 commits intoJul 10, 2026
Merged
Conversation
merlimat
approved these changes
Jul 7, 2026
dao-jun
approved these changes
Jul 8, 2026
Contributor
|
@nodece There's a test failing, related to this change |
lhotari
approved these changes
Jul 8, 2026
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
PR #25337 migrated broker delayed-delivery protos from protobuf-java to LightProto. Unlike protobuf-java which eagerly copies bytes fields, LightProto lazily references the parsed ByteBuf. The existing
parseSnapshotMetadataEntryreleased the buffer immediately after parsing, so any later access todelayed_index_bit_mapentries (viaforEachDelayedIndexBitMap) threwIllegalReferenceCountException(refCnt: 0).This caused
BucketDelayedDeliveryTrackerrecovery to fail on every broker restart, silently falling back toInMemoryDelayedDeliveryTracker— all bucket snapshots became unreachable, bucket-level metrics disappeared, and new snapshots were no longer created.Modifications
delayed_index_bit_mapentries into standalonebyte[]copies before releasing the entry buffer inparseSnapshotMetadataEntry.testParseSnapshotMetadataEntryMaterializesLazyBytesthat reproduces the bug by mockingLedgerEntrywith a refCnt=1 buffer (matching real BK, unlikeMockedBookKeeperwhich masks the bug with an extra reference).Verifying
The test fails without the fix (
IllegalReferenceCountException: refCnt: 0) and passes with it.