Handle timeout in the client IO task #1109
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
mkeeter
commented
Jan 24, 2024
| mut fr: FramedRead<R, crucible_protocol::CrucibleDecoder>, | ||
| mut fw: FramedWrite<W, crucible_protocol::CrucibleEncoder>, | ||
| log: &Logger, | ||
| log: Logger, |
There was a problem hiding this comment.
Github is butchering the diff here, sorry about that!
I moved the code from within the tokio::spawn into a separate function named rx_loop, which now includes the timeout as well as reading from the FramedRead (so it's got a select! in there)
There was a problem hiding this comment.
Ah yeah, thanks for the comment otherwise I would have puzzled about this for a while.
leftwo
approved these changes
Jan 24, 2024
| mut fr: FramedRead<R, crucible_protocol::CrucibleDecoder>, | ||
| mut fw: FramedWrite<W, crucible_protocol::CrucibleEncoder>, | ||
| log: &Logger, | ||
| log: Logger, |
There was a problem hiding this comment.
Ah yeah, thanks for the comment otherwise I would have puzzled about this for a while.
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.
This PR moves the timeout into the client IO task, for consistency with other forms of disconnection.
Previously, the main Upstairs event loop would notice the timeout, then tell the client task to stop; this was a roundabout way of doing things led to stuff like the panic seen in #1103.
For symmetry, we also move the ping task into the client IO task, since there's no reason to bother the main event loop about it: we always want to be pinging periodically, as long as the client IO task is running.