Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
Improve memory v2 lock retry controls in compressor (#1275)
heaoxiang-ai49977f83ee17
diff --git a/openviking/session/compressor_v2.py b/openviking/session/compressor_v2.pyindex 7572cbac0..948a749bf 100644--- a/openviking/session/compressor_v2.py+++ b/openviking/session/compressor_v2.py@@ -7,6 +7,7 @@ Uses the new Memory Templating System with ReAct orchestrator.Maintains the same interface as compressor.py for backward compatibility."""+import asynciofrom typing import List, Optionalfrom openviking.core.context import Context@@ -158,8 +159,11 @@ class SessionCompressorV2:memory_schema_dirs.append(dir_path)logger.debug(f"Memory schema directories to lock: {memory_schema_dirs}")- # 循环等待获取锁(机制确保不会死锁)- # 由于使用有序加锁法,可以安全地无限等待+ retry_interval = config.memory.v2_lock_retry_interval_seconds+ max_retries = config.memory.v2_lock_max_retries+ retry_count = 0++ # 循环重试获取锁(机制确保不会死锁)while True:lock_acquired = await lock_manager.acquire_subtree_batch(transaction_handle,@@ -168,7 +172,19 @@ class SessionCompressorV2:)if lock_acquired:break- logger.warning("Failed to acquire memory locks, retrying...")+ retry_count += 1+ if max_retries > 0 and retry_count >= max_retries:+ raise TimeoutError(+ "Failed to acquire memory locks after "+ f"{retry_count} retries (max={max_retries})"+ )++ logger.warning(+ "Failed to acquire memory locks, retrying "+ f"(attempt={retry_count}, max={max_retries or 'unlimited'})..."+ )+ if retry_interval > 0:+ await asyncio.sleep(retry_interval)orchestrator._transaction_handle = transaction_handle # 传递给 ExtractLoopdiff --git a/openviking_cli/utils/config/memory_config.py b/openviking_cli/utils/config/memory_config.pyindex b6889684f..8a87c8ebf 100644--- a/openviking_cli/utils/config/memory_config.py+++ b/openviking_cli/utils/config/memory_config.py@@ -24,6 +24,22 @@ class MemoryConfig(BaseModel):default="",description="Custom memory templates directory. If set, templates from this directory will be loaded in addition to built-in templates",)+ v2_lock_retry_interval_seconds: float = Field(+ default=0.2,+ ge=0.0,+ description=(+ "Retry interval (seconds) when SessionCompressorV2 fails to acquire memory subtree "+ "locks. Set to 0 for immediate retries."+ ),+ )+ v2_lock_max_retries: int = Field(+ default=0,+ ge=0,+ description=(+ "Maximum retries for SessionCompressorV2 memory lock acquisition. "+ "0 means unlimited retries."+ ),+ )model_config = {"extra": "forbid"}diff --git a/tests/session/memory/test_compressor_v2.py b/tests/session/memory/test_compressor_v2.pyindex 85397a768..a783bed57 100644--- a/tests/session/memory/test_compressor_v2.py+++ b/tests/session/memory/test_compressor_v2.py@@ -9,7 +9,7 @@ Uses MockVikingFS and real VLM (from config).import loggingfrom types import SimpleNamespacefrom typing import Any, Dict, List-from unittest.mock import patch+from unittest.mock import AsyncMock, patchimport pytest@@ -420,3 +420,65 @@ class TestCompressorV2:assert isinstance(memories, list)logger.info("Test completed successfully!")++ @pytest.mark.asyncio+ async def test_v2_lock_acquire_respects_max_retries(self):+ """v2 memory extraction should stop after configured lock retry limit."""+ compressor = SessionCompressorV2(vikingdb=None)+ user = UserIdentifier.the_default_user()+ ctx = RequestContext(user=user, role=Role.ROOT)+ messages = [Message.create_user("test")]++ class DummySchema:+ directory = "viking://user/{{ user_space }}/memories/events"++ class DummyProvider:+ def get_memory_schemas(self, _ctx):+ return [DummySchema()]++ def _get_registry(self):+ return object()++ class DummyOrchestrator:+ context_provider = DummyProvider()++ async def run(self):+ return (+ SimpleNamespace(+ write_uris=[],+ edit_uris=[],+ edit_overview_uris=[],+ delete_uris=[],+ ),+ [],+ )++ lock_manager = SimpleNamespace(+ create_handle=lambda: object(),+ acquire_subtree_batch=AsyncMock(return_value=False),+ release=AsyncMock(),+ )++ with (+ patch("openviking.session.compressor_v2.get_viking_fs", return_value=MockVikingFS()),+ patch("openviking.storage.transaction.init_lock_manager"),+ patch("openviking.storage.transaction.get_lock_manager", return_value=lock_manager),+ patch(+ "openviking.session.memory.memory_type_registry.create_default_registry",+ return_value=SimpleNamespace(initialize_memory_files=AsyncMock()),+ ),+ patch.object(compressor, "_get_or_create_react", return_value=DummyOrchestrator()),+ patch("openviking.session.compressor_v2.asyncio.sleep", new=AsyncMock()),+ ):+ initialize_openviking_config()+ config = get_openviking_config()+ config.memory.v2_lock_max_retries = 2+ config.memory.v2_lock_retry_interval_seconds = 0.0+ result = await compressor.extract_long_term_memories(+ messages=messages,+ ctx=ctx,+ strict_extract_errors=False,+ )++ assert result == []+ assert lock_manager.acquire_subtree_batch.await_count == 2