mcp: better handling for streamable context cancellation (#677)
After walking through our handling of streamable client context cancellation (due to encountering a shutdown deadlock), I think I've settled on a more coherent strategy for handling call cancellation: - In our call handler, retire the request if the call exits due to cancellation: the caller will never see the actual result anyway. - In connectSSE, use the actual request context (the same context used in Write) for the client request, so that it terminates when the context is cancelled. Thread through the initialization context for the standalone SSE request. Also, a couple minor improvements: - Use a detached context for the background context of the client connection. We want to preserve context values (see #513), but it is not right to cancel the connection after Connect has already returned, if the context times out. - Don't use Last-Event-ID != "" as the signal for whether the connectSSE call is initial: if the standalone SSE stream disconnects without an event ID, we'll still reconnect it, and don't want to do so without a delay. + tests, updating the streamable client connection test harness to accomodate the new aspects being exercised. Fixes #662
This commit is contained in:
parent
8adc1e3a3d
commit
272e0cd4f5
1 changed files with 284 additions and 68 deletions
|
|
@ -1788,8 +1788,8 @@ func TestStreamableClientContextPropagation(t *testing.T) {
|
|||
cancel()
|
||||
select {
|
||||
case <-streamableConn.ctx.Done():
|
||||
case <-time.After(100 * time.Millisecond):
|
||||
t.Error("Connection context was not cancelled when parent was cancelled")
|
||||
t.Errorf("cancelling the connection context after successful connection broke the connection")
|
||||
default:
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1945,7 +1945,7 @@ data: keepalive
|
|||
}
|
||||
|
||||
// Process the stream
|
||||
go conn.processStream("test", resp, testReq)
|
||||
go conn.processStream(ctx, "test", resp, testReq)
|
||||
|
||||
// Collect messages with timeout
|
||||
var messages []jsonrpc.Message
|
||||
|
|
|
|||
Loading…
Reference in a new issue