mcp: don't let a best-effort cancel notify delay connection teardown - #1241
Open
arpankernel wants to merge 1 commit into
Open
mcp: don't let a best-effort cancel notify delay connection teardown#1241arpankernel wants to merge 1 commit into
arpankernel wants to merge 1 commit into
Conversation
When a call is cancelled at its deadline, the notifications/cancelled is sent asynchronously, but Connection.Close's wait still blocked on that in-flight write for up to notifyCancellationTimeout against an unresponsive peer. Add a Closing signal to the jsonrpc2 connection and abort the notify once teardown begins, so Connect returns within its own deadline. Fixes modelcontextprotocol#1189
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
1 participant
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.
When a call is cancelled at its deadline, the best-effort
notifications/cancelledis sent asynchronously (#1151), butConnection.Closestill waited on that in-flight write for up tonotifyCancellationTimeoutagainst an unresponsive peer. SoConnectcould return well past its own deadline: 7s on a 2s deadline against a peer that accepts the TCP connection but never replies.This adds a
Closingsignal to the jsonrpc2 connection and aborts the best-effort notify once teardown begins, soConnectreturns within its deadline. Closing the connection already signals the cancellation, so waiting on the notify buys nothing.Includes a black-hole regression test asserting
Connectstays within its deadline (red before, green after).Fixes #1189