A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: preserve shared-memory virtual files owned by other live sessions (#9228)
Junghwanf02d0cdef081
diff --git a/marimo/_runtime/virtual_file/storage.py b/marimo/_runtime/virtual_file/storage.pyindex ba4515c7ed..0a9143a921 100644--- a/marimo/_runtime/virtual_file/storage.py+++ b/marimo/_runtime/virtual_file/storage.py@@ -176,19 +176,24 @@ class SharedMemoryStorage(VirtualFileStorage):del self._storage[key]def shutdown(self, keys: Iterable[str] | None = None) -> None:- del keys # Always clear all - not sharedif self._shutting_down:returntry:self._shutting_down = True+ if keys is not None:+ for key in list(keys):+ self.remove(key)+ return+for shm in self._storage.values():if sys.platform == "win32":shm.close()shm.unlink()self._storage.clear()finally:- self._stale = Trueself._shutting_down = False+ if keys is None:+ self._stale = Truedef has(self, key: str) -> bool:return key in self._storagediff --git a/tests/_runtime/test_storage.py b/tests/_runtime/test_storage.pyindex 0fa1c784f4..672f805e62 100644--- a/tests/_runtime/test_storage.py+++ b/tests/_runtime/test_storage.py@@ -180,6 +180,20 @@ class TestSharedMemoryStorage:assert not storage.has("marimo_test_6")assert not storage.has("marimo_test_7")+ def test_shutdown_with_keys_only_removes_requested_entries(self) -> None:+ storage = SharedMemoryStorage()+ try:+ storage.store("marimo_test_subset_1", b"data1")+ storage.store("marimo_test_subset_2", b"data2")++ storage.shutdown(keys=["marimo_test_subset_1"])++ assert not storage.has("marimo_test_subset_1")+ assert storage.has("marimo_test_subset_2")+ assert storage.read("marimo_test_subset_2", 5) == b"data2"+ finally:+ storage.shutdown()+def test_cross_process_read(self) -> None:"""Test that shared memory can be read by name from a fresh instance."""storage1 = SharedMemoryStorage()diff --git a/tests/_runtime/test_virtual_file.py b/tests/_runtime/test_virtual_file.pyindex 8d475d629e..f46a44613a 100644--- a/tests/_runtime/test_virtual_file.py+++ b/tests/_runtime/test_virtual_file.py@@ -1,10 +1,16 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations+import uuid+from marimo._runtime.commands import DeleteCellCommandfrom marimo._runtime.context import get_contextfrom marimo._runtime.runtime import Kernel-from marimo._runtime.virtual_file.storage import InMemoryStorage+from marimo._runtime.virtual_file.storage import (+ InMemoryStorage,+ SharedMemoryStorage,+ VirtualFileStorageManager,+)from marimo._runtime.virtual_file.virtual_file import (VirtualFile,VirtualFileLifecycleItem,@@ -329,6 +335,46 @@ def test_virtual_file_registry_shared_inmemory_storage(assert read_virtual_file(vf.filename, 3) == b"abc"+def test_virtual_file_registry_shared_shared_memory_storage() -> None:+ """A shared-memory registry teardown must not clobber another live+ registry in the same process.++ AppHost-backed run sessions for one notebook share a process but each+ session gets its own runtime context + VirtualFileRegistry. That is the+ same multi-registry shape the in-memory regression test above covers;+ here we assert the shared-memory backend honors the same contract.+ """+ manager = VirtualFileStorageManager()+ original_storage = manager.storage+ key1 = f"{uuid.uuid4().hex[:8]}.txt"+ key2 = f"{uuid.uuid4().hex[:8]}.txt"+ context = type("Context", (), {"virtual_files_supported": True})()++ registry1 = None+ registry2 = None+ try:+ manager.storage = None+ registry1 = VirtualFileRegistry(storage=SharedMemoryStorage())+ registry1.add(VirtualFile(filename=key1, buffer=b"one"), context)+ assert read_virtual_file(key1, 3) == b"one"++ registry2 = VirtualFileRegistry(storage=SharedMemoryStorage())+ registry2.add(VirtualFile(filename=key2, buffer=b"two"), context)+ assert read_virtual_file(key2, 3) == b"two"++ registry1.shutdown()++ # A still-live registry must keep serving its files after another+ # session tears down.+ assert read_virtual_file(key2, 3) == b"two"+ finally:+ manager.storage = original_storage+ if registry1 is not None:+ registry1.shutdown()+ if registry2 is not None:+ registry2.shutdown()++def test_create_and_register_with_context(run_mode_kernel: MockedKernel, # noqa: ARG001) -> None: