Enforce timeout for system DNS resolution - #906
Merged
Conversation
ryanfowler
marked this pull request as ready for review
July 27, 2026 23:29
ryanfowler
enabled auto-merge
July 27, 2026 23:29
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
TimeoutBudgetaround the systemlookup_hostbranch ofresolve_host_with_doh_tls--connect-timeoutRoot cause
The system-resolver branch awaited
tokio::net::lookup_hostdirectly, even thoughresolve_host_with_doh_tlsreceived a timeout budget. Callers such as explicit HTTP/3 setup and QUIC TLS inspection await this resolver directly, allowing a stalled system resolver to run beyond the configured connect timeout.An initial implementation wrapped the complete resolver state machine in
TimeoutBudget::run. That enlarged the stack-resident request future enough to overflow the default-sizedfetch-mainruntime thread in several network integration tests. The corrected implementation wraps only a boxed system lookup future, leaving the larger DoH/custom resolver paths unchanged.Impact
System DNS resolution now terminates with the normal request timeout diagnostic when it stalls. Explicit HTTP/3 connections and QUIC TLS inspection honor the configured connect timeout without increasing request stack usage.
Validation
cargo fmt --checkcargo clippy --locked --all-targets --all-features -- -D warningscargo test --locked --all-features --lib --bins(872 passed)--test-threads=2cargo test --locked --all-features --test network -- --test-threads=2(27 passed)