fix(openclaw-plugin): prevent CONFLICT errors with commit lock#1055
Open
leckylao wants to merge 1 commit intovolcengine:mainfrom
Open
fix(openclaw-plugin): prevent CONFLICT errors with commit lock#1055leckylao wants to merge 1 commit intovolcengine:mainfrom
leckylao wants to merge 1 commit intovolcengine:mainfrom
Conversation
When auto-capture in afterTurn and memory_store tool both try to commit to the same OpenViking session simultaneously, the server returns a CONFLICT error. This adds a simple in-memory lock mechanism: - Add commitLocks Set to track in-flight commits per session - Skip afterTurn if a commit is already in progress for that session - Release lock in finally block to ensure cleanup on error This prevents the error: 'OpenViking request failed [CONFLICT]: Session xxx already has a commit in progress'
4 tasks
|
Failed to generate code suggestions for PR |
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.
Problem
When using the OpenClaw plugin with auto-capture enabled, we frequently encounter CONFLICT errors:
This happens when two code paths try to commit to the same OpenViking session simultaneously:
afterTurnhook auto-capturememory_storetool explicit commitSolution
Add a simple in-memory lock mechanism in
context-engine.ts:Behavior
afterTurnskips the auto-capture for that turnfinallyblock to ensure cleanup even on errorTesting
Tested on production OpenClaw instance with OpenViking 0.2.12. CONFLICT errors no longer appear.