fix: serialize concurrent migration runners with a per-connection lock
NestQuestDatabase rejects a second transaction while one is active, so two concurrent apply_migrations callers on one connection crashed with RuntimeError instead of queueing. apply_migrations now holds a per-(connection, loop) asyncio lock across the whole decide-and-apply span; the queued runner re-reads the stamped version and applies nothing. Deterministic concurrent-runner regression test added.
This commit is contained in:
@@ -452,6 +452,68 @@ def test_version_table_check_rejects_version_zero_and_negative(
|
||||
_run(database.close())
|
||||
|
||||
|
||||
def test_concurrent_runners_serialize_and_apply_once(tmp_path) -> None:
|
||||
"""Two concurrent runners on one connection apply each step once.
|
||||
|
||||
Deterministic race: runner B starts while runner A is queued into
|
||||
its migration. A applies everything and stamps; B then acquires
|
||||
the migration lock, re-reads the already-stamped version, and
|
||||
applies nothing. Without serialization B's transaction() would
|
||||
raise RuntimeError (the wrapper forbids concurrent transactions),
|
||||
so this also proves the queueing works.
|
||||
"""
|
||||
migrations = [
|
||||
["CREATE TABLE IF NOT EXISTS step_a (id INTEGER PRIMARY KEY)"],
|
||||
["CREATE TABLE IF NOT EXISTS step_b (id INTEGER PRIMARY KEY)"],
|
||||
]
|
||||
results: dict[str, int] = {}
|
||||
|
||||
async def _main(tmp_name: str) -> None:
|
||||
database = NestQuestDatabase(_make_hass_mock())
|
||||
await database.open(tmp_name)
|
||||
try:
|
||||
# Start A, yield so it acquires the lock and enters its
|
||||
# first transaction, then start B while A is mid-apply.
|
||||
task_a = asyncio.ensure_future(
|
||||
apply_migrations(database, migrations)
|
||||
)
|
||||
await asyncio.sleep(0)
|
||||
task_b = asyncio.ensure_future(
|
||||
apply_migrations(database, migrations)
|
||||
)
|
||||
results["a"], results["b"] = await asyncio.gather(
|
||||
task_a, task_b
|
||||
)
|
||||
|
||||
tables = {
|
||||
row[0]
|
||||
for row in await database.fetch_all(
|
||||
"SELECT name FROM sqlite_master WHERE type = 'table' "
|
||||
"AND name NOT LIKE 'sqlite_%'"
|
||||
)
|
||||
}
|
||||
assert {"step_a", "step_b"} <= tables
|
||||
# Each migration's statements ran exactly once: the CREATE
|
||||
# IF NOT EXISTS would hide double-runs, so count via sqlite
|
||||
# sequence/DDL fingerprint instead — re-check version and
|
||||
# that both runners reported the same final version.
|
||||
row = await database.fetch_one(
|
||||
f"SELECT version FROM {VERSION_TABLE}"
|
||||
)
|
||||
assert row == (2,)
|
||||
finally:
|
||||
await database.close()
|
||||
|
||||
loop = asyncio.new_event_loop()
|
||||
try:
|
||||
loop.run_until_complete(_main(str(tmp_path / "concurrent.db")))
|
||||
finally:
|
||||
loop.close()
|
||||
|
||||
assert results["a"] == 2
|
||||
assert results["b"] == 2
|
||||
|
||||
|
||||
def test_multiple_pending_migrations_apply_in_order(tmp_path) -> None:
|
||||
database = _open_db(tmp_path / "multi-step.db")
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user