Skip to content

fix: resolve OpenClaw session file lock conflicts in oc2ov tests#1441

Merged
qin-ctx merged 1 commit intovolcengine:mainfrom
kaisongli:fix/openclaw-session-lock
Apr 14, 2026
Merged

fix: resolve OpenClaw session file lock conflicts in oc2ov tests#1441
qin-ctx merged 1 commit intovolcengine:mainfrom
kaisongli:fix/openclaw-session-lock

Conversation

@kaisongli
Copy link
Copy Markdown
Collaborator

  • Add pre-start cleanup in upgrade_openviking.sh: remove stale .lock and .jsonl.lock files, kill all residual openclaw processes before restart
  • Add session lock awareness in openclaw_cli_client.py: wait for lock release before sending requests and after subprocess returns
  • Optimize wait_for_sync in base_cli_test.py: enforce minimum 5s wait, check lock release before proceeding, raise poll interval to 3s minimum
  • Prevent FailoverError: session file locked (timeout 10000ms) caused by concurrent access to the same session ID in CI environment

Description

Related Issue

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Refactoring (no functional changes)
  • Performance improvement
  • Test update

Changes Made

Testing

  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • I have tested this on the following platforms:
    • Linux
    • macOS
    • Windows

Checklist

  • My code follows the project's coding style
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published

Screenshots (if applicable)

Additional Notes

@github-actions
Copy link
Copy Markdown

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
🏅 Score: 85
🧪 No relevant tests
🔒 No security concerns identified
✅ No TODO sections
🔀 No multiple PR themes
⚡ No major issues detected

@github-actions
Copy link
Copy Markdown

PR Code Suggestions ✨

No code suggestions found for the PR.

@kaisongli kaisongli force-pushed the fix/openclaw-session-lock branch 4 times, most recently from c539705 to e7541c7 Compare April 14, 2026 11:02
…ertion

- Add pre-start cleanup in upgrade_openviking.sh: remove stale .lock
  and .jsonl.lock files, kill all residual openclaw processes before restart
- Add session lock awareness in openclaw_cli_client.py: wait for lock
  release before sending requests and after subprocess returns
- Optimize wait_for_sync in base_cli_test.py: enforce minimum 5s wait,
  check lock release before proceeding, raise poll interval to 3s minimum
- Add Chinese descriptions for Memory V2 test cases in conftest.py
- Fix test_session_commit assertion: remove pre_archive_abstracts check
  since get_session_context no longer returns this field
@kaisongli kaisongli force-pushed the fix/openclaw-session-lock branch from e7541c7 to 1708982 Compare April 14, 2026 11:05
@qin-ctx qin-ctx merged commit d18d9d7 into volcengine:main Apr 14, 2026
6 checks passed
@github-project-automation github-project-automation bot moved this from Backlog to Done in OpenViking project Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants