Items 3 + 4 from the consolidated adversarial-review punch list.
ITEM 3 — placeholders no longer poison the audit trail:
The prefetch (master/prefetch.py) writes input_payload with
``attempt_id=0`` and ``attempt_number=1`` as placeholders because
the autoincrement PK isn't known until after INSERT. Previously
those values stayed in the DB forever — post-mortem queries against
``workflow_attempts.input_payload`` would show ``attempt_id=0``
and operators would chase ghosts.
Fix: ``master/scheduler.py:_insert_pending_attempt`` now patches both
fields with their real values:
- attempt_number: patched BEFORE the INSERT (we compute it as MAX+1).
- attempt_id: patched via a follow-up UPDATE after INSERT (we need
the autoincrement first). One extra UPDATE per attempt; cheap
compared to forever-incorrect audit trail.
Test: ``test_scheduler_patches_attempt_id_and_number_into_payload``
asserts the stored payload carries the real values, not the
placeholders.
ITEM 4 — pickup_count tracks REAPS, not dequeues:
Previously the dequeue path bumped ``pickup_count = pickup_count + 1``
on every successful pickup. With ``MAX_PICKUPS=3`` (default), 3
crashed-mid-attempt workers would STUCK the workflow — but that's
the wrong semantic. A worker that successfully picks an attempt
and runs it should NOT burn a pickup. Only failures (stale-heartbeat
reset by the reaper) should count toward the exhaustion limit.
Fix:
- ``db/dequeue.py`` (both postgres + sqlite paths): removed the
``pickup_count = pickup_count + 1`` UPDATE. Dequeue is a healthy
pickup; doesn't bump.
- ``reaper.py``: added ``pickup_count = pickup_count + 1`` to the
reset UPDATE. Each reap = one failed pickup.
- Docstrings updated to reflect the new semantics in both files.
Tests:
- Updated existing assertions in ``test_db_dequeue.py`` and
``test_reaper_and_pickup_guard.py`` to reflect: dequeue keeps
pickup_count; reaper bumps it.
- ``TestPickupCountSemantics``: 2 new tests pin the contract end-to-end
— N healthy dequeues stay at 0; alternating dequeue→reap→dequeue
walks pickup_count up by 1 per reap.
Impact: a worker pool that crashes 3 times mid-attempt now needs
3 REAPS (not 3 dequeues) to STUCK the workflow. With default
TTL=600s + reaper_interval=60s, that's 30+ minutes of repeated
mid-attempt failure before STUCK — appropriately conservative.
Total: 593 controller tests pass (+3 new), 0 regressions.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
drew
a1c6646a64