[fix][client] Send all chunkMessageIds to broker for redelivery #25229
+34
−2
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 #25220
Motivation
There is an issue that chunked message cannot be redeliveryed for shared subscription mode. The client should send all chunk message ids to broker for redelivery but it hasn't. It only send the last chunk messageId and that's the root cause of this issue.
The problematic code path is that:
In
addChunkedMessageIdsAndRemoveFromSequenceMapmethod, all chunk messageIds of same message should be fetched fromconsumerBase.unAckedChunkedMessageIdSequenceMapbut it found nothing there. Actually,unAckedChunkedMessageIdSequenceMaphas recorded the value by key which has type ofChunkMessageIdImpl.ChunkMessageIdImplhas a different hashcode fromMessageIdImpl. That's why we found nothing there.I have noticed that there is a
nackedMessageIdsmap inNegativeAcksTracker. And it's convenient to record the origin messageId bynackedMessageIdswhich has a type ofChunkMessageIdImpl.Modifications
Record the origin messageId by the map
nackedMessageIdsinNegativeAcksTracker#addVerifying this change
This change added tests and can be verified as follows:
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: berg223#4