fix(watcher): recover after prolonged lock contention - #1486
Draft
stsoul wants to merge 1 commit into
Draft
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
Root cause
The bounded retry behavior added around #891 prevents a hot retry loop, but it also turns recoverable lock contention into a one-way failure. If a competing indexer holds the lock longer than five watcher retries,
degrade()stops the watcher and clears pending state. Releasing the lock later cannot recover the running MCP session.This change bounds the retry rate rather than the retry lifetime. The lock retry counter saturates at the fifth backoff step, so retries continue at the existing 30-second ceiling. A successful sync still resets the counter immediately.
Impact
Long-running index or sync processes can finish without permanently disabling auto-sync in another CodeGraph process. Pending files remain visible as stale while the lock is held and are cleared after the next successful sync.
Validation
LockUnavailableErrorresults followed by a successful ninth attemptnpm run cg:smokepassed against the same watcher change, including recovery after the former retry boundarymainby exactly the three intended filesThe upstream test suite was not run from a separate checkout; this draft relies on the included focused test and downstream contract until CI runs.