Fix #423 resent msg not added to timeout queue #582
Merged
Conversation
This file contains 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
hylkevds
changed the title
hylkevds
force-pushed
the
fix_423_resent_msg_not_added_to_timeoutQueue
branch
from
bac9f8a to
696ab80
Compare
Messages that are re-sent were not added to the timeout queue, as a result, if the re-sent failed as well, the message was not resent again, instead remaining on the inflightWindow for ever. By re-adding it to the inflightTimeouts, the message is "kept alive" until sending succeeds.
Between the contains and get calls, another thread could steal the value. This also saves one hash lookup.
hylkevds
force-pushed
the
fix_423_resent_msg_not_added_to_timeoutQueue
branch
from
696ab80 to
00aab1f
Compare
|
I've rebased on master, and cherry-picked the commit from #607 |
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.
Messages that are re-sent were not added to the timeout queue, as a result, if the re-sent failed as well, the message was not resent again, instead remaining on the inflightWindow for ever. By re-adding it to the inflightTimeouts, the message is "kept alive" until sending succeeds.
inflightTimeouts.add(new InFlightPacket(notAckPacketId.packetId, FLIGHT_BEFORE_RESEND_MS));The second commit is a slight performance optimisation, doing a get + null check instead of a contains + get