fix(controller): resolve mutex deadlock between agent and remotemcpserver reconcilers #1214
+383
−59
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
Fixes controller reconciliation deadlock by removing the application-level
upsertLockmutex. Database-level concurrency control (atomic upserts and transactions) now handles synchronization.Problem
The shared
upsertLockmutex blocked all Agent reconciliations when RemoteMCPServer reconciliation performed slow network I/O while holding the lock.Solution
Phase 1: Reduced lock scope to exclude network I/O
Phase 2: Fixed Agent predicate to ensure Create events are always processed
Phase 3: Removed mutex entirely - database handles concurrency via:
INSERT ... ON CONFLICT DO UPDATERefreshToolsForServer()Phase 4: Documentation and tests
StoreAgentandStoreToolServerRefreshToolsForServerabout transaction scope