Fix: Prevent session manager shutdown on individual session crash #841
+168
−13
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.
Previously, an unhandled exception within a single MCP session's
MCPServer.run()
task could propagate to theStreamableHTTPSessionManager
's main task group. This would cause the entire task group to cancel, effectively shutting down the session manager and terminating all active sessions.This commit addresses the issue by:
self.app.run(...)
call within therun_server
(for stateful requests) andrun_stateless_server
(for stateless requests) inner functions inStreamableHTTPSessionManager
with atry...except Exception
block.This change ensures that if a single session encounters an unexpected error and crashes, it only affects that specific session. The
StreamableHTTPSessionManager
will continue to run, and other active sessions will remain operational. This significantly improves the robustness and availability of the server.Motivation and Context
Unhandled exceptions such as a network error would render the server unusable until restart
How Has This Been Tested?
Yes, specifically by generating client disconnects and observing the server log the unhandled error but remain running and stable
Breaking Changes
No breaking changes
Types of changes
Checklist
Additional context