mcp: fix race condition in ServerSession.startKeepalive#856
Open
begelundmuller wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
Conversation
a6679c3 to
4af6c16
Compare
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.
This PR fixes a race condition where
ServerSession.keepaliveCancelwas accessed inCloseconcurrently with its initialization inServerSession.startKeepalive. It also removes a now redundant test.The fix moves keepalive initialization into
ServerSession.Connectsimilar to the implementation inClientSession.Connect. This is safe because the MCP spec allows keepalive pings before the initialization messages. From the MCP spec (emphasis added):The PR includes a reproducer test case, which fails with the following error without this fix: