fix: Fuse oneshot channel #147
Merged
Conversation
This file contains hidden or 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
tokio::select! requires the futures to be fused, see for example tokio-rs/tokio#3812
This reverts commit 95ce856.
we don't want to update tokio just yet
matheus23
reviewed
Mar 11, 2025
| @@ -449,12 +449,13 @@ impl<C: ConnectionErrors> fmt::Display for RpcServerError<C> { | |||
| impl<C: ConnectionErrors> error::Error for RpcServerError<C> {} | |||
|
|
|||
| /// Take an oneshot receiver and just return Pending the underlying future returns `Err(oneshot::Canceled)` | |||
There was a problem hiding this comment.
Suggested change
| /// Take an oneshot receiver and just return Pending the underlying future returns `Err(oneshot::Canceled)` | |
| /// Take an oneshot receiver and just return Pending when the underlying future returns `Err(oneshot::Canceled)` |
matheus23
approved these changes
Mar 11, 2025
|
Checked in CI of n0-computer/iroh-blobs#68 that this indeed fixes this particular issue |
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.
It seems that under some weird circumstances we get a situation where an oneshot channel is polled after completion. Oneshot channel is not fused for no good reason that I can see, so we get a panic.
This did not happen before, but now it happens more frequently and causes frequent test failures in iroh-blobs CI.
There is a way to detect an already terminated oneshot channel in tokio 1.44 from 2025-03-07, so we could just modify the poll fn of the wrapper to call that. But since I don't want to update the tokio dep for a patch, I just wrap it in a fuse. We can do the is_terminated thing once we get tokio 1.44.