[#5536] tokio-util: fix panic in DelayQueue #5630
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
Darksonn
added
A-tokio-util
|
Hi @Darksonn - do you have an ETA for the next tokio-util release? |
|
If you submit a release PR for tokio-util, then I can make a release today. (Example in #5442.) Otherwise, I can make a release early next week. |
|
I won't have space to make that PR, but a release early next week would be great- thanks. |
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.
Fixes: #5536
Motivation
Experienced an upstream service which had been running for over 2 years to have an outage due to this bug.
This was also a bug in tokio up to and including version 0.3.4.
Solution
I copied the fix in tokio, which fudges any items which have timers which would logically go into the top+1 level into the top level.
This means that you can insert an item into "the past" (if the time since the queue has been alive is in the top most level, and the item has been fudged into the top level too, and occupies an earlier slot). We handle this by bumping up the corresponding timer by the level range.
Added test to check that inserting to a delayqueue that has existed for more than the 2^36 ms doesn't panic.
Cargo fmt ran.