rt: fix blocking pool shutdown logic #1978
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
The blocking task queue was not explicitly drained as part of the blocking pool shutdown logic. It was originally assumed that the contents of the queue would be dropped when the blocking pool structure is dropped. However, tasks must be explictly shutdown, so we must drain the queue can call `shutdown` on each task. Fixes #1970, #1946
hawkw
approved these changes
Dec 17, 2019
tokio/src/runtime/blocking/pool.rs
Outdated
| impl Drop for Inner { | ||
| fn drop(&mut self) { | ||
| let shared = self.shared.lock().unwrap(); | ||
| assert!(shared.queue.is_empty()); |
There was a problem hiding this comment.
this seems like a good way to get weird SIGILLs if there's a bug in the logic for draining the queue...can we just drain the queue here instead, or is there a reason we can't do that?
There was a problem hiding this comment.
Oh yeah, this wasn't meant to make it into the final... I was debugging still.
| drop(shared); | ||
| task.shutdown(); | ||
|
|
||
| shared = self.shared.lock().unwrap(); |
There was a problem hiding this comment.
the way this code drops and then reacquires the lock to be used in the next iteration of the loop is a little weird to me, but I can't really think of a better way to express it, given that the lock is already held when the loop starts...
It was there for debugging
hawkw
approved these changes
Dec 18, 2019
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.
The blocking task queue was not explicitly drained as part of the
blocking pool shutdown logic. It was originally assumed that the
contents of the queue would be dropped when the blocking pool structure
is dropped. However, tasks must be explictly shutdown, so we must drain
the queue can call
shutdownon each task.Fixes #1970, #1946