-
Notifications
You must be signed in to change notification settings - Fork 930
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(relay): correctly track associated state of inflight streams #4841
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
This comment was marked as resolved.
This comment was marked as resolved.
thomaseizinger
commented
Nov 13, 2023
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
…822-relay-state # Conflicts: # Cargo.toml # protocols/relay/CHANGELOG.md
mxinden
approved these changes
Nov 15, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for debugging!
Thank you for this fix. Can we get a patch release for this? /CC @mxinden |
Sure! I'll make a release in a bit. |
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.
Description
In the relay client, we need to track a fair bit of data alongside
Future
s that are executing within aFuturesSet
. In particular, we need to track the channels that connect us theTransport
. Using?
within the actualasync
block of the protocol is crucial for ergonomics but essentially locks us out of passing the channel into theFuture
itself. Hence, we need to track it outside.As we can see from #4822, doing so in a separate list is error prone.
We solve this by introducing the
FuturesTupleSet
type tofutures-bounded
. This is a variation ofFuturesSet
that carries a piece of arbitrary data alongside theFuture
that is executing and returns it back upon completion.Using this within the relay code reveals another bug where we mistakenly confused a timed out
CONNECT
request for a timed outRESERVE
request.Fixes: #4822.
Notes & open questions
FuturesTupleSet
are welcome.Change checklist