fix: gracefully terminate active Streamable HTTP sessions during shutdown (#2150)#2746
Open
kaushik701 wants to merge 2 commits into
Open
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.
Fixes #2150
Problem
When shutting down a FastMCP/MCP server (CTRL+C) while clients have active streaming connections, Uvicorn logs:
There were two compounding issues:
StreamableHTTPSessionManager.run()never calledterminate()on active transports before cancelling the task group — it just cleared the dict, leavingEventSourceResponsecoroutines killed mid-stream.terminate()itself didn't close_sse_stream_writers. It only cleaned up_request_streams, but the SSE stream writers (which keepEventSourceResponsealive) were stored separately and never touched, soEventSourceResponsekept waiting on its reader.Fix
src/mcp/server/streamable_http_manager.py— In therun()method'sfinallyblock, iterate over all active transports and callterminate()on each before cancelling the task group:src/mcp/server/streamable_http.py— Interminate(), close all_sse_stream_writersbefore cleaning up request streams, so activeEventSourceResponseinstances can complete gracefully:Notes
_terminatedflag ensures that any concurrent requests arriving during shutdown get a 404, not a partial response..close()onMemoryObjectSendStream(rather thanawait aclose()) is safe and avoids awaiting inside the shutdown path.