fix(oauth): avoid lock contention for long-running requests - #3243
Open
ctaylor86 wants to merge 3 commits into
Open
fix(oauth): avoid lock contention for long-running requests#3243ctaylor86 wants to merge 3 commits into
ctaylor86 wants to merge 3 commits into
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.
Summary
Problem
OAuthClientProvider.async_auth_flow()currently holdscontext.lockacrossresponse = yield request. A Streamable HTTP or SSE GET can remain open for the lifetime of the MCP session, so every concurrent POST auth flow waits forever on that lock. This affects clients that reuse persisted OAuth credentials and can also surface as a lock-owner cleanup error when the transport is cancelled.This backports the lock-scope direction from #2660 / #2858 to the maintained
v1.xbranch. OAuth 401/403 state transitions remain serialized, but normal resource requests and stale-token retries yield outside the lock. Refresh uses a separate lock and re-checks token validity after acquiring it to avoid duplicate refreshes.Fixes #1326.
Relates to #2847 and #2858.
Validation
uv run --frozen pytest -n 0 -q: 1162 passed, 95 skipped, 1 xfaileduv run --frozen ruff check .: passeduv run --frozen ruff format --check .: passeduv run --frozen pyright: passed