Revert minor part of #16968 to fix message redelivery #17029
Closed
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 #17028 #16830
Motivation
In #16968, there was a change to remove some logic that appears necessary for certain message delivery guarantees. This PR fixes the minor regression introduced in that PR.
Modifications
sendInProgress = truebefore dispatching the read request.volatilekeyword fromsendInProgress. It is only updated withinsynchronizedblocks.Verifying this change
I verified that both
testDelayedDeliveryWithMultipleConcurrentReadEntriesandtestMessageRedeliverypass consistently. Both were failing on my machine and stopped failing when I setsendInProgress = true.Documentation
doc-not-needed