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
fix(storage): use exact lock for content writes (#2064)
Qin Haojief79f69d99721
diff --git a/openviking/storage/content_write.py b/openviking/storage/content_write.pyindex c4f93057b..82b2a79d0 100644--- a/openviking/storage/content_write.py+++ b/openviking/storage/content_write.py@@ -179,15 +179,16 @@ class ContentWriteCoordinator:) -> Dict[str, Any]:lock_manager = get_lock_manager()handle = lock_manager.create_handle()- lock_path = self._viking_fs._uri_to_path(root_uri, ctx=ctx)- acquired = await lock_manager.acquire_tree(handle, lock_path)+ lock_path = self._viking_fs._uri_to_path(uri, ctx=ctx)+ acquired = await lock_manager.acquire_exact_path(handle, lock_path)if not acquired:await lock_manager.release(handle)raise InvalidArgumentError(f"resource is busy and cannot be written now: {uri}")previous_content: Optional[str] = Nonecontent_written = False- lock_transferred = False+ semantic_enqueued = False+ lock_released = Falsetry:if mode != "create":previous_content = await self._viking_fs.read_file(uri, ctx=ctx)@@ -200,10 +201,12 @@ class ContentWriteCoordinator:changed_uri=uri,context_type=context_type,ctx=ctx,- lifecycle_lock_handle_id=handle.id,+ lifecycle_lock_handle_id="",change_type="added" if mode == "create" else "modified",)- lock_transferred = True+ semantic_enqueued = True+ await lock_manager.release(handle)+ lock_released = Truequeue_status = (await self._wait_for_request(telemetry_id=telemetry_id, timeout=timeout)if wait@@ -219,7 +222,7 @@ class ContentWriteCoordinator:queue_status=queue_status,)except Exception:- if not lock_transferred and content_written:+ if not semantic_enqueued and content_written:await self._rollback_direct_write(uri=uri,previous_content=previous_content,@@ -227,7 +230,7 @@ class ContentWriteCoordinator:ctx=ctx,lock_handle=handle,)- if not lock_transferred:+ if not lock_released:await lock_manager.release(handle)raisefinally:diff --git a/tests/server/test_content_write_service.py b/tests/server/test_content_write_service.pyindex b37bb5dca..97011faaa 100644--- a/tests/server/test_content_write_service.py+++ b/tests/server/test_content_write_service.py@@ -285,7 +285,7 @@ async def test_resource_write_semantic_refresh_uses_coalesce_key(monkeypatch):@pytest.mark.asyncio-async def test_write_timeout_after_enqueue_does_not_release_resource_lock(monkeypatch):+async def test_write_timeout_after_enqueue_releases_resource_lock(monkeypatch):file_uri = "viking://resources/demo/doc.md"root_uri = "viking://resources/demo"ctx = RequestContext(user=UserIdentifier.the_default_user(), role=Role.USER)@@ -317,7 +317,7 @@ async def test_write_timeout_after_enqueue_does_not_release_resource_lock(monkeywait=True,)- assert lock_manager.release_calls == []+ assert lock_manager.release_calls == ["lock-1"]assert viking_fs.delete_temp_calls == []assert viking_fs.content[file_uri] == "updated"@@ -358,7 +358,7 @@ async def test_resource_write_updates_target_and_queues_refresh_before_return(moassert captured_enqueue["changed_uri"] == file_uriassert captured_enqueue["change_type"] == "modified"assert viking_fs.delete_temp_calls == []- assert lock_manager.release_calls == []+ assert lock_manager.release_calls == ["lock-1"]@pytest.mark.asyncio