fix: recover from ErrSessionMissing when remote MCP server restarts#2212
Merged
dgageot merged 1 commit intodocker:mainfrom Mar 22, 2026
Merged
fix: recover from ErrSessionMissing when remote MCP server restarts#2212dgageot merged 1 commit intodocker:mainfrom
dgageot merged 1 commit intodocker:mainfrom
Conversation
| return nil | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| case <-time.After(sessionMissingRetryTimeout): |
There was a problem hiding this comment.
The sessionMissingRetryTimeout is set to 30 seconds, but tryRestart() uses exponential backoff that can take up to 31 seconds total (1+2+4+8+16 seconds across 5 retry attempts).
This creates a race condition where:
- A tool call encounters
ErrSessionMissingand callsforceReconnectAndWait() watchConnectionis in the middle of a backoff sleep (e.g., the 16-second sleep on the 5th retry)- The tool call times out at 30 seconds and returns an error to the user
- A second later, the reconnect completes successfully
- The next identical tool call succeeds
Impact: Non-deterministic failures where tool calls fail with "timed out waiting for MCP server reconnection" even though the server successfully reconnects moments later.
Recommendation: Either increase sessionMissingRetryTimeout to 35-40 seconds to account for the maximum backoff duration, or coordinate the timeout with the actual retry logic (e.g., calculate remaining backoff time).
Assisted-By: docker-agent
rumpl
approved these changes
Mar 22, 2026
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.
Assisted-By: docker-agent