Repository navigation
fix: cancel pending request tokens after transport EOF - #1333
Merged
alexhancock merged 1 commit intoOct 9, 2026
Conversation
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.
Pending request handlers can outlive transport EOF while a caller retains the
RunningServiceor aPeer. TheirRequestContextcancellation tokens are children of the service loop token, but the EOF path did not cancel that token.Cancel the service loop token after the existing response-drain period and before closing the transport. This preserves graceful response draining and wakes remaining handlers without cancelling an externally supplied parent token or sibling services.
The regression sends two requests over a real in-memory transport, leaves both handlers pending, and closes the peer input. It retains the service and peer while asserting that both request tokens are cancelled and both handlers finish. Tokio time is paused so the drain deadline adds no wall-clock delay.
Validation
cargo +1.97.1 test -p rmcp --test test_inflight_response_drain --test test_close_connection --test test_cancelled_response --features "client server transport-io": all 16 tests passed.