Fix dropping TLS for detached futures #139
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
When a detached future is being cleaned up after the end of an execution, it won't be able to access the current task's storage any more. We need to bail out early from the cleanup to avoid a panic.
jamesbornholt
force-pushed
the
future-tls-drop
branch
from
ab1b48b
to
30ba405
Compare
bkragl
reviewed
Mar 7, 2024
Comment on lines
+148
to
+153
| // If we've finished execution already (this task was detached), don't clean up. We | ||
| // can't access the state any more to destroy thread locals, and don't want to run | ||
| // any more wakers (which will be no-ops anyway). | ||
| if ExecutionState::try_with(|state| state.is_finished()).unwrap_or(true) { | ||
| return Poll::Ready(()); | ||
| } |
There was a problem hiding this comment.
Why are we still polling the future if execution already finished?
Was the task's local storage already dropped in ExecutionState::cleanup when we drained tasks?
There was a problem hiding this comment.
We're not re-polling the future after execution finishes. But at ExecutionState::cleanup time, we drop the continuation, which for unfinished tasks involves resuming the task so that it can unwind its stack. That's how we end up in this code. We do still clean up the task's local storage inExecutionState::cleanup, so this change isn't actually leaking anything, just changing where the cleanup happens.
jorajeev
approved these changes
Mar 7, 2024
|
|
||
| struct ShuttleSpawn; | ||
|
|
||
| impl Spawn for ShuttleSpawn { |
There was a problem hiding this comment.
Nice - didn't know about the Spawn trait.
jamesbornholt
added a commit
to jamesbornholt/mountpoint-s3
that referenced
this pull request
Mar 7, 2024
The Shuttle issue was fixed by awslabs/shuttle#139 Signed-off-by: James Bornholt <bornholt@amazon.com>
github-merge-queue bot
pushed a commit
to awslabs/mountpoint-s3
that referenced
this pull request
Mar 7, 2024
The Shuttle issue was fixed by awslabs/shuttle#139 Signed-off-by: James Bornholt <bornholt@amazon.com>
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.
When a detached future is being cleaned up after the end of an
execution, it won't be able to access the current task's storage any
more. We need to bail out early from the cleanup to avoid a panic.
I also fixed two small issues:
Span::recordcall, despite only specifying an earlier version.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.