fix(proxy): Race cache lock wait against client disconnect detection#800
Open
skidder wants to merge 1 commit intocloudflare:mainfrom
Open
fix(proxy): Race cache lock wait against client disconnect detection#800skidder wants to merge 1 commit intocloudflare:mainfrom
skidder wants to merge 1 commit intocloudflare:mainfrom
Conversation
When a client disconnects while waiting on a cache lock, the server-side handler previously continued waiting for the full lock timeout (e.g., 60 seconds) before releasing resources. This wasted server resources and caused delays when clients cancelled requests. The fix introduces `cache_lock_wait_or_disconnect()` which uses `tokio::select!` to race the cache lock wait against client disconnect detection via `read_body_or_idle(true)`. When a client disconnects, the server-side handler now exits immediately instead of waiting for the lock timeout. This applies to HTTP/1.1 (TCP close detection) and HTTP/2 (stream reset detection). For HTTP/3, this helps when the QUIC termination layer properly propagates cancellation signals. Includes regression tests that verify: - Server closes connections within 1 second of client disconnect (with fix) - Without fix, server waits ~2 seconds for lock age timeout
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
cache_lock_wait_or_disconnect()which usestokio::select!to race cache lock wait against client disconnect detectionProblem
When multiple clients request the same uncached resource:
WritePermit) and fetches from originReadLock) and wait for the writerThis wasted server resources and caused delays, particularly noticeable with long lock timeouts.
Solution
Race the cache lock wait against client disconnect detection:
Protocol Support
poll_reset()Test plan
test_cache_lock_reader_client_disconnect- basic disconnect testtest_cache_lock_reader_disconnect_timing- timing regression test that fails without the fix