Fixed key-shared delivery of messages with interleaved delays #15409
+81
−25
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
merlimat
added
type/bug
merlimat
requested review from
Jason918,
Technoboy-,
codelipenghui,
hezhangjian and
BewareMyPower
eolivelli
requested changes
May 1, 2022
.../java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
Show resolved
Hide resolved
Jason918
reviewed
May 2, 2022
| } | ||
| readMoreEntries(); | ||
| return; | ||
| } else { |
There was a problem hiding this comment.
Why only do this in else part？
It seems replayPosition could be popped from delayedDeliveryTracker if minReplayedPosition is null.
There was a problem hiding this comment.
@Jason918 You are absolutely correct, we need to do in both cases. Fixed it
merlimat
added a commit
that referenced
this pull request
May 2, 2022
* Fixed key-shared delivery of messages with interleaved delays * Fixed checkstyle * Always add to redelivery messages
mattisonchao
added
cherry-picked/branch-2.9
touchkey
pushed a commit
to sajithsebastian/pulsar
that referenced
this pull request
Mar 30, 2023
…#15409) * Fixed key-shared delivery of messages with interleaved delays * Fixed checkstyle * Always add to redelivery messages
touchkey
pushed a commit
to sajithsebastian/pulsar
that referenced
this pull request
Mar 30, 2023
…#15409) * Fixed key-shared delivery of messages with interleaved delays * Fixed checkstyle * Always add to redelivery messages
touchkey
pushed a commit
to sajithsebastian/pulsar
that referenced
this pull request
Mar 30, 2023
…#15409) * Fixed key-shared delivery of messages with interleaved delays * Fixed checkstyle * Always add to redelivery messages
narmathaansp
pushed a commit
to sajithsebastian/pulsar
that referenced
this pull request
Mar 30, 2023
…#15409) * Fixed key-shared delivery of messages with interleaved delays * Fixed checkstyle * Always add to redelivery messages
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
Fixes #15397
The changes in #12890 introduced a regression that when delayed messages with interleaved delays occur on a shared subscriptions, many of the messages are not delivered and stay in the backlog.
The reason is that we're peeking into
getMessagesToReplayNow()and we cannot discard the returned set, because these message ids are not tracked anymore in the delayed messages controller.