fix(notifications): stop tick-wide row locks + poisoned-session swallows behind the PendingRollbackError 500s (#743)

* fix(notifications): release re-escalation row locks per row; stop swallowing DB errors in notify_get

The re-escalation sweep ran one tick-wide transaction, so each CAS
claim's row lock was held across every remaining delivery until the
single commit — a concurrent mark-read UPDATE on a claimed row starved
into the 60s lock_timeout. The sweep now commits per row (claim commit
releases the lock before delivery and makes the burned slot durable),
re-fetches each row by snapshotted id so one row's rollback can't
expire the rest of the tick, and savepoints each recipient's delivery.

notify_get's bare except swallowed the resulting LockNotAvailableError
into a false "notification not found" and returned a poisoned session
to the commit-at-send middleware, which blew up with
PendingRollbackError; it now catches only the two domain outcomes.

defer_after_commit's listeners fire on SAVEPOINT release too, which
would have drained deferred telegram/bus work before real durability —
they now skip savepoint boundaries via get_nested_transaction() (the
root get_transaction() is non-None inside the listener even at a real
commit). acknowledge_for_recipient's Redis dedup-clear moved before the
flush so the row lock never spans a Redis round-trip. The five
best-effort CEO-notify swallows that persist notification rows are
savepointed.

* fix(services): contain swallowed best-effort DB write failures instead of poisoning the session

Sweep of the same class as the notify_get incident: broad
except-Exception handlers that swallow a failure whose try-body writes
through the shared session leave the session rollback-pending, and the
verb/request then dies later with PendingRollbackError at
commit-at-send. Confirmed-dangerous sites now run the write inside a
savepoint (safe since defer_after_commit skips savepoint boundaries):
ceo_approve's verified-stamp, completion/pitch/postmortem-style CEO
notifies, _inherit_upstream_base, _link_commit_to_task (covers every
commit route), board-program LEARN records, the QA/PR-gate/PM-merge
verified-stamps, and the documenter->PM handoff.
_ack_pending_wake_notifications gets the same treatment so a wake-ack
failure can't fail the A2A read. telegram_inbound's per-update loop and
intake confirm roll back explicitly instead (their success paths commit
mid-flow, so a savepoint doesn't fit).

A swallowed savepoint rollback fully expires any ORM object mutated
inside the block, and the next attribute read raises MissingGreenlet —
strictly worse than the original bug. The two paths that keep using the
object after the swallow (doc handoff's envelope build, base
inheritance's claim continuation) refresh it in the except path;
regression tests run against a real session and were verified to fail
with the refresh reverted.

* test: shape mocked session.execute results so sync accessors stop leaking unawaited coroutines

An AsyncMock's auto-created children are themselves AsyncMock, so
production code that correctly awaits session.execute() and then calls
sync accessors (.scalars().all(), .scalar_one_or_none()) on the result
was silently collecting unawaited coroutines in 22 test files — 80
RuntimeWarnings per unit run, and in test_flow_soup_guard one mock
raised a real TypeError that a coincidentally-matching invalid_state
envelope masked. Each affected fixture now returns a plain MagicMock
shaped like a real Result. Zero AsyncMock warnings remain.

* docs: document per-row sweep commits and the savepoint/refresh containment pattern

---------

Co-authored-by: Renn F <rennf93@users.noreply.github.com>
This commit is contained in:
Renzo F
2026-07-30 16:35:42 +02:00
committed by GitHub
co-authored by Renn F
parent 8b18dc3e95
commit 93739a9dca
39 changed files with 1230 additions and 138 deletions
+53 -1
View File
@@ -43,7 +43,7 @@ from roboco.models.base import (
from roboco.models.events import EventType
from roboco.services.a2a import _LIVE_VIEW_EXCERPT_CHARS, A2AService
from roboco.services.gateway.evidence_repo import EvidenceRepo
from sqlalchemy import select
from sqlalchemy import select, text
from sqlalchemy import select as _sel
from sqlalchemy.sql.dml import Update
@@ -2636,3 +2636,55 @@ async def test_read_a2a_acks_pending_wake_notification(a2a_setup: dict) -> None:
refreshed = await db.get(NotificationTable, notif_id)
assert refreshed is not None
assert qa.id in refreshed.acked_by
@pytest.mark.asyncio
async def test_ack_pending_wake_notifications_savepoint_isolates_db_failure(
a2a_setup: dict,
) -> None:
"""A genuine Postgres-level failure inside `_ack_pending_wake_notifications`
(e.g. `bulk_acknowledge`'s flush hitting a lock timeout) must not poison
the shared session for whatever the caller does next. Force a REAL DB
error — not a bare Python exception, which alone never aborts the
underlying Postgres transaction — via a failing raw statement patched
into `bulk_acknowledge`, then prove the session is still usable
afterwards (no `PendingRollbackError`)."""
svc: A2AService = a2a_setup["svc"]
db = a2a_setup["db"]
qa = a2a_setup["qa"]
dev = a2a_setup["dev"]
notif = NotificationTable(
type=NotificationType.A2A_REQUEST,
priority=NotificationPriority.NORMAL,
from_agent=dev.id,
to_agents=[qa.id],
subject="A2A: ceo_dm",
body="pending wake",
requires_ack=True,
)
db.add(notif)
await db.flush()
notif_id = notif.id
async def _boom(_self: object, *_args: object, **_kwargs: object) -> None:
await db.execute(text("SELECT 1/0"))
with patch(
"roboco.services.notification_delivery.NotificationDeliveryService."
"bulk_acknowledge",
_boom,
):
await svc._ack_pending_wake_notifications(qa.id) # must not raise
# The savepoint rolled back the poisoned statement — the shared session
# is still usable for later work. Must be a real round trip (`.get()` on
# an already-identity-mapped, unexpired object would just return the
# cached instance without touching the DB, silently hiding a poisoned
# transaction) — `execute(select(...))` always issues the query.
refreshed = (
await db.execute(
select(NotificationTable).where(NotificationTable.id == notif_id)
)
).scalar_one()
assert qa.id not in refreshed.acked_by # the swallowed failure never acked