mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-03 17:58:04 +00:00
Second bug found while validating the previous commit on hardware. install_plugin's new set-aside/restore had no lock. The web UI runs Flask threaded, so a double-clicked Install button gives two threads the same plugin_id; interleaved, one thread's restore deletes the other's freshly installed copy. _reinstall_with_rollback already guards exactly this with a per-plugin lock, and install_plugin needs the same one. Taking that lock naively deadlocks. _reinstall_with_rollback holds it across its call to install_plugin, and threading.Lock is not reentrant -- so the request thread hangs forever on the standard monorepo update path (update_plugin -> _reinstall_with_rollback -> install_plugin), which is to say on every plugin update. Verified by reverting to a plain Lock: the regression test times out after 10s instead of passing. The per-plugin locks are now RLocks, and install_plugin holds one for its whole set-aside/install/restore sequence. Verified on devpi (Pi, Python 3.13.5, real registry and network): - update_plugin on an up-to-date plugin: True in 5.4s - update_plugin forced through the full reinstall-with-rollback path: True in 13.1s, correct version restored, old copy replaced, no backup directories left behind - install -> reinstall-over-existing -> failed-reinstall-restores: all pass against real downloads - 22 plugins load, no tracebacks, web API and UI 200, steady-state journal 50 lines/min 791 core unit tests pass, including 2 new concurrency tests. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Udr6MfaFLUPhX5Fgo67Jf5
223 lines
9.2 KiB
Python
223 lines
9.2 KiB
Python
"""A failed (re)install must not destroy the working plugin it replaced.
|
|
|
|
`_install_plugin_impl` deletes the existing plugin directory *before* it
|
|
downloads anything, so any failure after that point used to leave the user with
|
|
nothing. The update path was protected — `_reinstall_with_rollback` renames the
|
|
old copy aside first — but a direct `install_plugin` was not, and the
|
|
compatibility gate added a new way to fail late: a plugin whose declared floor
|
|
exceeds the running core is now refused *after* the old copy is already gone.
|
|
|
|
Concretely, without the wrapper: a user on core 3.1.0 with a working
|
|
hockey-scoreboard clicks Install; the new manifest floors at 3.2.0; the gate
|
|
refuses; the plugin they had is deleted. Floors are hand-written and can be
|
|
over-declared, so this could remove a plugin that was working fine.
|
|
"""
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from src.plugin_system.store_manager import PluginStoreManager
|
|
|
|
|
|
@pytest.fixture
|
|
def store(tmp_path):
|
|
plugins_dir = tmp_path / "plugin-repos"
|
|
plugins_dir.mkdir()
|
|
mgr = PluginStoreManager(plugins_dir=str(plugins_dir))
|
|
mgr.logger = MagicMock()
|
|
return mgr, plugins_dir
|
|
|
|
|
|
def _existing_install(plugins_dir: Path, plugin_id: str, marker: str) -> Path:
|
|
path = plugins_dir / plugin_id
|
|
path.mkdir(parents=True)
|
|
(path / "manifest.json").write_text(
|
|
json.dumps({"id": plugin_id, "name": plugin_id, "class_name": "P",
|
|
"display_modes": ["a"], "version": "1.0.0"}),
|
|
encoding="utf-8")
|
|
(path / "marker.txt").write_text(marker, encoding="utf-8")
|
|
return path
|
|
|
|
|
|
class TestFailedInstallPreservesPrevious:
|
|
def test_failed_install_restores_the_old_copy(self, store, monkeypatch):
|
|
mgr, plugins_dir = store
|
|
path = _existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", lambda *a, **k: False)
|
|
|
|
assert mgr.install_plugin("hockey-scoreboard") is False
|
|
assert path.exists(), "the previous install must be restored"
|
|
assert (path / "marker.txt").read_text() == "the-original"
|
|
|
|
def test_raising_install_restores_and_reraises(self, store, monkeypatch):
|
|
mgr, plugins_dir = store
|
|
path = _existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
def boom(*a, **k):
|
|
raise RuntimeError("network died mid-install")
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", boom)
|
|
|
|
with pytest.raises(RuntimeError):
|
|
mgr.install_plugin("hockey-scoreboard")
|
|
assert path.exists()
|
|
assert (path / "marker.txt").read_text() == "the-original"
|
|
|
|
def test_successful_install_clears_the_backup(self, store, monkeypatch):
|
|
mgr, plugins_dir = store
|
|
_existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
def succeed(plugin_id, branch=None):
|
|
_existing_install(plugins_dir, plugin_id, "the-new-one")
|
|
return True
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", succeed)
|
|
|
|
assert mgr.install_plugin("hockey-scoreboard") is True
|
|
assert (plugins_dir / "hockey-scoreboard" / "marker.txt").read_text() == "the-new-one"
|
|
leftovers = [p.name for p in plugins_dir.iterdir() if "backup" in p.name]
|
|
assert not leftovers, f"backup left behind: {leftovers}"
|
|
|
|
def test_backup_name_is_invisible_to_plugin_discovery(self, store, monkeypatch):
|
|
"""A backup that discovery can see becomes a duplicate plugin entry;
|
|
the marker '.standalone-backup-' is what makes it skip."""
|
|
mgr, plugins_dir = store
|
|
_existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
seen = {}
|
|
|
|
def capture(plugin_id, branch=None):
|
|
seen["dirs"] = sorted(p.name for p in plugins_dir.iterdir())
|
|
return False
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", capture)
|
|
mgr.install_plugin("hockey-scoreboard")
|
|
|
|
backups = [d for d in seen["dirs"] if d != "hockey-scoreboard"]
|
|
assert backups, "expected the old copy to be set aside during install"
|
|
for name in backups:
|
|
assert ".standalone-backup-" in name, (
|
|
f"{name} would be picked up by "
|
|
"plugin_manager._scan_directory_for_plugins as a real plugin")
|
|
|
|
def test_fresh_install_is_a_pass_through(self, store, monkeypatch):
|
|
"""Nothing installed means nothing to protect; don't create stray dirs."""
|
|
mgr, plugins_dir = store
|
|
calls = []
|
|
monkeypatch.setattr(
|
|
mgr, "_install_plugin_impl",
|
|
lambda *a, **k: calls.append(a) or True)
|
|
|
|
assert mgr.install_plugin("brand-new") is True
|
|
assert calls, "the implementation must still be called"
|
|
assert list(plugins_dir.iterdir()) == []
|
|
|
|
def test_stale_backup_from_a_crash_does_not_block(self, store, monkeypatch):
|
|
mgr, plugins_dir = store
|
|
_existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
stale = plugins_dir / "hockey-scoreboard.standalone-backup-preinstall"
|
|
stale.mkdir()
|
|
(stale / "junk.txt").write_text("from a previous crash", encoding="utf-8")
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", lambda *a, **k: False)
|
|
|
|
assert mgr.install_plugin("hockey-scoreboard") is False
|
|
assert (plugins_dir / "hockey-scoreboard" / "marker.txt").read_text() == "the-original"
|
|
|
|
|
|
class TestUpdatePathStillWorks:
|
|
def test_reinstall_with_rollback_is_not_double_wrapped(self, store, monkeypatch):
|
|
"""_reinstall_with_rollback moves the plugin aside itself, so by the
|
|
time install_plugin runs there is nothing at the original path and the
|
|
wrapper must be a pass-through rather than staging a second backup."""
|
|
mgr, plugins_dir = store
|
|
path = _existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
observed = {}
|
|
|
|
def impl(plugin_id, branch=None):
|
|
observed["dirs"] = sorted(p.name for p in plugins_dir.iterdir())
|
|
return False
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", impl)
|
|
|
|
assert mgr._reinstall_with_rollback("hockey-scoreboard", path) is False
|
|
# Exactly one aside directory existed during the attempt — rollback's.
|
|
assert observed["dirs"] == ["hockey-scoreboard.standalone-backup-migrating"]
|
|
# And the user still has their plugin.
|
|
assert (plugins_dir / "hockey-scoreboard" / "marker.txt").read_text() == "the-original"
|
|
|
|
|
|
class TestConcurrency:
|
|
"""The web UI runs Flask threaded, so a double-clicked Install button puts
|
|
two threads on the same plugin_id. `_reinstall_with_rollback` already
|
|
guarded against this; the install wrapper has to as well, or one thread's
|
|
restore deletes the other's freshly installed copy."""
|
|
|
|
def test_rollback_calling_install_does_not_deadlock(self, store, monkeypatch):
|
|
"""The rollback path holds the per-plugin lock across its call to
|
|
install_plugin. A non-reentrant lock would hang the request thread
|
|
forever — this test would time out rather than fail."""
|
|
import threading
|
|
|
|
mgr, plugins_dir = store
|
|
path = _existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
monkeypatch.setattr(
|
|
mgr, "_install_plugin_impl",
|
|
lambda pid, branch=None: bool(_existing_install(plugins_dir, pid, "new")))
|
|
|
|
done = threading.Event()
|
|
result = {}
|
|
|
|
def run():
|
|
result["ok"] = mgr._reinstall_with_rollback("hockey-scoreboard", path)
|
|
done.set()
|
|
|
|
t = threading.Thread(target=run, daemon=True)
|
|
t.start()
|
|
assert done.wait(timeout=10), (
|
|
"install_plugin deadlocked when called from _reinstall_with_rollback "
|
|
"— the per-plugin lock must be reentrant"
|
|
)
|
|
assert result["ok"] is True
|
|
|
|
def test_concurrent_installs_serialize(self, store, monkeypatch):
|
|
"""Two threads installing the same plugin must not interleave their
|
|
set-aside/restore, and the survivor must be a complete install."""
|
|
import threading
|
|
|
|
mgr, plugins_dir = store
|
|
_existing_install(plugins_dir, "hockey-scoreboard", "the-original")
|
|
|
|
in_flight = []
|
|
overlap = []
|
|
|
|
def slow_impl(plugin_id, branch=None):
|
|
in_flight.append(1)
|
|
if len(in_flight) > 1:
|
|
overlap.append(1)
|
|
threading.Event().wait(0.05)
|
|
_existing_install(plugins_dir, plugin_id, "installed")
|
|
in_flight.pop()
|
|
return True
|
|
|
|
monkeypatch.setattr(mgr, "_install_plugin_impl", slow_impl)
|
|
|
|
threads = [threading.Thread(target=mgr.install_plugin,
|
|
args=("hockey-scoreboard",), daemon=True)
|
|
for _ in range(2)]
|
|
for t in threads:
|
|
t.start()
|
|
for t in threads:
|
|
t.join(timeout=10)
|
|
assert not t.is_alive(), "concurrent install hung"
|
|
|
|
assert not overlap, "two installs of the same plugin ran concurrently"
|
|
assert (plugins_dir / "hockey-scoreboard" / "marker.txt").exists()
|
|
leftovers = [p.name for p in plugins_dir.iterdir() if "backup" in p.name]
|
|
assert not leftovers, f"backup left behind: {leftovers}"
|