Geal/clean up dedup on cancel #758
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
✅ Deploy Preview for apollo-router-docs ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
|
hmm, looks like I created this branch from the wrong one 😅 I'll clean that up. The relevant code is in f261ff9 |
BrynCooke
reviewed
Mar 30, 2022
| // when _drop_signal is dropped, either by getting out of the block, returning | ||
| // the error from ready_oneshot or by cancellation, the drop_sentinel future will | ||
| // return with Err(), then we remove the entry from the wait map | ||
| let (_drop_signal, drop_sentinel) = oneshot::channel::<()>(); |
There was a problem hiding this comment.
Nit: could be a mutex rather than a channel.
Geal
force-pushed
the
geal/clean-up-dedup-on-cancel
branch
from
f261ff9 to
0b441c2
Compare
This comment has been minimized.
This comment has been minimized.
garypen
requested changes
Mar 31, 2022
There was a problem hiding this comment.
We should also update: https://github.com/apollographql/router/blob/main/apollo-router-core/src/cache.rs
to maintain consistency.
|
|
|
can we agree to merge this one at least? |
garypen
approved these changes
Apr 4, 2022
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.
Fix #754
This takes care of cleaning up the wait map by using a oneshot channel as drop signal. This is a pattern that I used a lot in pulsar-rs to perform async tasks on drop