Skip to content
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 case where cancelled future would be leaked and add a regression … #3965

Merged
merged 1 commit into from Jul 18, 2021

Conversation

Diggsey
Copy link
Contributor

@Diggsey Diggsey commented Jul 18, 2021

…test.

Fixes #3964

I have no idea if this is the correct fix as I don't really understand the design behind this code. EIther way, the comment here "The future has already been dropped" seems to be inaccurate.

edit:
Updated based on feedback from @Darksonn - pretty sure this is the correct fix now.

@Diggsey Diggsey force-pushed the db-fix-leaked-future branch 2 times, most recently from e67de44 to 6e79a80 Compare July 18, 2021 16:38
…test.

Add panic-on-drop tests for JoinHandle::abort.
@Darksonn Darksonn added A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime labels Jul 18, 2021
@Darksonn Darksonn merged commit 7c4183a into tokio-rs:master Jul 18, 2021
@Diggsey Diggsey deleted the db-fix-leaked-future branch July 18, 2021 20:48
sthagen added a commit to sthagen/tokio-rs-tokio that referenced this pull request Jul 19, 2021
runtime: drop future when polling cancelled future (tokio-rs#3965)
zonyitoo added a commit to shadowsocks/shadowsocks-rust that referenced this pull request Jul 20, 2021
database64128 pushed a commit to Shadowsocks-NET/shadowsocks-rs that referenced this pull request Jul 21, 2021
atkdef pushed a commit to atkdef/shadowsocks-rust that referenced this pull request Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime
Projects
None yet
Development

Successfully merging this pull request may close these issues.

JoinHandle::abort has no effect if the handle is immediately dropped
2 participants