Fix async resolver worker deadlock#11
Merged
Merged
Conversation
pwang347
approved these changes
Jul 14, 2026
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
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.
Summary
Release the in-flight map mutex before notifying async resolution waiters.
The previous
if let lock(...).get(...).cloned()left the sole resolver worker unable to process a second distinct queued request, so later async callers waited forever.Regression coverage
tests/async_resolution.rsruns two distinct async resolutions in a subprocess. The parent kills and fails a child that does not exit within five seconds, so a wedgedstd::threadcannot hang the whole test suite.Verified with isolated build directories:
4e2bfc6: fails in 5.01 s withasync resolver worker did not process its second distinct requestValidation
cargo test --features tokio --test async_resolutioncargo test --features tokiocargo clippy --all-targets --features tokio -- -D warningscargo fmt --all -- --check