fix(subscriber): the disk fallback re-reads the record before taking an audit status (Issue #57, Mac R1)
The record (status, token, attempt, transition_seq) was read before the audit status.json; if A error -> redispatch (attempt 2) -> B completed happened in between, the audit terminal was B's while the token and attempt validated were A's, and A's caller was told "completed". The audit status is now taken only when a fresh read of the record still shows the same token, attempt and transition_seq; otherwise the job stays pending and the next round reads both afresh. The no-record case is unchanged. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
1 parent
151af99765
commit
1c598bb546
2 files changed
+60
-1
No files matched your search
@@ -118,7 +118,24 @@ def _check_disk_fallback(
|
||||
logger.warning("disk fallback ignored audit status %r for %s: transition_seq %r is older "
|
||||
"than the record's %r", logged.get("status"), jid, aud_seq, rec_seq)
|
||||
else:
|
||||
disk_status = logged.get("status")
|
||||
# The record above was read before the audit status. If
|
||||
# another dispatch began in between (A error -> redispatch
|
||||
# -> B completed), the audit terminal is B's while the token
|
||||
# and attempt checked below are A's. Take it only when the
|
||||
# record still describes the same observation; otherwise
|
||||
# leave the job pending for the next round, which reads
|
||||
# both afresh (Issue #57, Mac review R1).
|
||||
try:
|
||||
now = load_job(jid, registry_dir)
|
||||
except Exception:
|
||||
now = {}
|
||||
same = ((now.get("dispatch_token"), now.get("attempt_id", now.get("iteration")),
|
||||
now.get("transition_seq")) == (rec_token, rec_attempt, rec_seq))
|
||||
if same:
|
||||
disk_status = logged.get("status")
|
||||
else:
|
||||
logger.warning("disk fallback deferred %s: the record changed while the audit status "
|
||||
"was being read", jid)
|
||||
|
||||
if disk_status in ("completed", "error", "cancelled"):
|
||||
if expected_dispatch_tokens:
|
||||
|
||||
Reference in new issue
Block a user