shaw
80a229bce5
fix(batch-image): 修复审计发现的计费死锁、状态机与队列原子性缺陷
修复 PR #3768 批量图像 MVP 合并后审计报告中的全部问题:
结算与计费(高危):
- 所有 SETTLEMENT_* 失败(超冻结/计数非法/manifest 冲突/定价缺失/扣费失败)
统一计入 retry_count 并在耗尽时释放冻结转 failed,消灭 settling 无限
requeue 导致的冻结余额永久锁死
- 耗尽出口的释放指纹统一为 RequestHash,与 processor/Cancel/recovery 一致;
release 遇同 request id 指纹冲突视为幂等成功,治愈历史毒消息
- 管理端校验 hold_multiplier >= discount_multiplier,定价快照对存量脏数据钳制
- 释放前校验 per-job hold claim(dedup+归档表),杜绝幻影释放
索引对账(高危):
- provider 输出与提交 custom_id 集对账:未知条目丢弃并记事件,
漏项补 PROVIDER_RESULT_MISSING 失败行,保证 success+fail == item_count
提交与恢复(高危):
- 提交前转 uploading 并在 provider.Submit 期间心跳刷新 updated_at;
恢复扫描改为原子复核(FailStaleUnsubmittedBatchImageJob),
消灭慢提交被误杀退款而上游任务照常计费的孤儿场景
- 上游任务创建成功但本地状态推进失败时,尽力取消上游并清理输入
- recovery 释放失败时入队交由 worker releaseTerminalHold 兜底重试
队列与并发(中危):
- Enqueue(SetNX+LPush)与 Reserve(BRPop+ZAdd)均改为 Lua 原子脚本,
消灭崩溃窗口导致 job 脱离队列、被 7 天 inflight 键锁死
- 锁冲突按 LockConflictDelay 重新入队(原直接丢弃需等 10 分钟 stale 恢复)
- 处理期间心跳:active zset 续期(ZAddXX 防幽灵成员)+ 锁 TTL 续期
- ReplaceBatchImageItemsForJob 增加 indexing 状态守卫,防掉队 worker 重写账目
存量回归(中危):
- image-only 定价条目(仅图片价无 token 价)恢复 token 计费 fail-closed,
不再按 $0 计费;图片计费路径不受影响
- 鉴权余额门槛恢复 balance <= 0 语义,MinimumBalanceReserve 不再作硬 403
加固:
- ZIP max_items 钳制到管理员上限;Submit 补齐 Platform==Gemini 校验;
gemini downloadUri 跟随前做 host 白名单校验
- 批量客户端改用共享 httpclient(拨号/TLS/响应头超时有界)
- 审计点名的忽略错误(MarkDownloaded/SettlementFailed/AppendEvent 等)改为记日志
2026-07-07 18:53:56 +08:00
..
2026-05-14 11:46:24 +08:00
2026-07-01 14:35:49 +08:00
2026-04-09 18:14:28 +08:00
2026-07-01 12:21:45 +08:00
2026-06-16 14:08:50 +08:00
2026-06-16 11:39:15 +08:00
2026-07-05 17:24:38 +08:00
2026-05-20 15:44:00 +08:00
2026-02-02 22:13:50 +08:00
2026-05-03 22:12:57 +08:00
2026-05-03 22:12:57 +08:00
2026-05-03 22:12:57 +08:00
2026-05-20 15:52:00 +08:00
2026-04-21 10:13:28 -07:00
2026-04-09 18:14:28 +08:00
2026-05-14 16:38:45 +08:00
2026-01-03 06:37:08 -08:00
2026-01-03 06:37:08 -08:00
2026-02-02 22:13:50 +08:00
2026-06-05 14:00:57 +08:00
2026-02-22 22:07:17 +08:00
2026-05-07 09:14:47 +08:00
2026-04-09 18:14:28 +08:00
2026-07-06 12:22:04 +08:00
2026-04-22 18:36:44 +08:00
2026-04-22 14:56:56 +08:00
2026-03-14 17:48:21 +08:00
2026-03-16 20:22:10 +08:00
2026-07-07 10:50:36 +08:00
2026-07-07 10:50:36 +08:00
2026-07-07 18:53:56 +08:00
2026-07-07 18:53:56 +08:00
2026-07-07 11:24:04 +08:00
2026-07-07 18:53:56 +08:00
2026-02-07 19:46:42 +08:00
2026-02-08 12:05:39 +08:00
2026-02-07 19:46:42 +08:00
2026-05-29 17:19:15 +08:00
2026-07-01 00:37:51 +08:00
2026-06-12 22:09:53 +08:00
2026-05-19 22:05:43 +08:00
2026-04-14 09:35:20 +08:00
2026-04-04 11:13:58 +08:00
2026-04-09 18:14:28 +08:00
2026-04-14 18:34:57 +08:00
2026-06-25 23:41:00 +08:00
2026-06-25 23:41:00 +08:00
2026-03-02 16:04:20 +08:00
2026-03-27 14:33:05 +08:00
2026-01-01 04:01:51 +08:00
2026-07-07 10:04:38 +08:00
2026-07-07 10:04:38 +08:00
2026-05-07 09:14:47 +08:00
2026-06-12 01:47:01 +08:00
2026-06-26 10:43:05 +08:00
2026-04-15 15:02:21 +08:00
2026-01-11 15:00:16 +08:00
2026-01-11 15:00:16 +08:00
2026-05-23 15:04:24 +08:00
2026-05-23 15:04:24 +08:00
2026-06-12 15:06:01 +08:00
2025-12-25 17:15:01 +08:00
2025-12-26 16:47:44 +08:00
2026-04-14 09:35:20 +08:00
2026-03-07 18:19:04 +08:00
2026-02-05 21:52:54 +08:00
2026-02-10 11:42:39 +08:00
2025-12-31 23:42:01 +08:00
2026-07-01 12:21:45 +08:00
2026-02-28 15:01:20 +08:00
2026-06-12 01:47:01 +08:00
2026-02-02 22:13:50 +08:00
2026-02-26 10:53:04 +08:00
2026-03-02 16:04:20 +08:00
2026-01-14 15:55:44 +08:00
2026-01-14 15:55:44 +08:00
2026-01-15 18:27:06 +08:00
2026-03-02 16:04:20 +08:00
2026-01-07 23:15:20 +08:00
2026-03-02 16:04:20 +08:00
2026-06-26 10:36:09 +08:00
2026-06-26 10:36:09 +08:00
2026-05-20 16:53:23 +08:00
2026-05-20 11:33:29 +08:00
2026-07-06 13:40:09 +08:00
2026-05-26 13:57:59 +08:00
2026-05-26 13:57:59 +08:00
2026-06-12 15:06:01 +08:00
2026-02-28 15:01:20 +08:00
2026-02-23 12:45:37 +08:00
2025-12-25 17:15:01 +08:00
2025-12-26 16:47:44 +08:00
2026-03-02 01:12:41 +08:00
2026-01-03 06:36:35 -08:00
2026-04-08 10:39:15 -07:00
2026-03-27 20:11:24 +08:00
2026-06-05 22:47:24 +08:00
2026-06-05 22:47:24 +08:00
2026-04-22 18:01:51 +08:00
2026-04-22 18:01:51 +08:00
2026-06-16 11:50:25 +08:00
2026-07-06 12:22:04 +08:00
2026-06-27 14:35:19 +08:00
2026-04-23 12:58:13 +08:00
2026-04-23 12:23:04 +08:00
2026-04-23 12:23:04 +08:00
2026-07-03 23:02:27 +08:00
2026-01-15 15:14:44 +08:00
2026-02-28 15:01:20 +08:00
2026-06-05 10:58:44 +08:00
2026-02-14 11:21:30 +08:00
2026-06-05 14:00:57 +08:00
2026-01-11 23:49:03 +08:00
2026-01-09 20:52:57 +08:00
2026-03-03 01:05:11 +08:00
2026-06-05 14:00:57 +08:00
2026-01-23 19:39:48 +08:00
2026-02-12 14:20:14 +08:00
2026-02-12 14:20:14 +08:00
2026-06-05 10:58:44 +08:00
2026-01-12 14:17:42 +08:00
2026-05-19 19:37:41 +08:00
2026-01-11 23:57:20 +08:00
2026-06-27 14:35:19 +08:00
2026-01-24 01:14:44 +08:00
2026-01-09 20:52:57 +08:00
2026-07-03 23:02:27 +08:00
2026-06-16 11:48:13 +08:00
2026-04-09 18:14:28 +08:00
2026-03-02 16:04:20 +08:00
2026-03-02 16:04:20 +08:00
2026-04-09 19:25:08 +08:00
2026-06-08 00:01:30 +08:00
2026-01-15 15:14:44 +08:00
2026-02-03 17:12:27 +08:00
2026-03-19 23:48:37 +08:00
2025-12-29 19:23:49 +08:00
2026-06-08 00:01:30 +08:00
2026-06-08 00:01:30 +08:00
2025-12-26 16:47:44 +08:00
2025-12-26 16:47:44 +08:00
2025-12-26 16:47:44 +08:00
2026-05-20 16:08:41 +08:00
2026-04-09 18:14:28 +08:00
2026-05-20 16:08:41 +08:00
2026-02-02 22:13:50 +08:00
2026-02-02 22:13:50 +08:00
2026-02-05 12:42:54 +08:00
2026-03-02 16:04:20 +08:00
2026-03-12 21:24:01 +08:00
2026-02-28 20:38:35 +08:00
2026-03-08 06:59:53 +08:00
2026-04-30 11:38:11 +08:00
2026-07-05 17:24:38 +08:00
2026-07-01 12:21:45 +08:00
2026-07-05 17:24:38 +08:00
2026-06-16 14:21:09 +08:00
2026-06-16 11:57:32 +08:00
2026-02-02 22:13:50 +08:00
2026-02-12 12:07:20 +08:00
2026-02-12 12:04:13 +08:00
2026-06-02 12:46:46 +08:00
2026-03-04 10:15:42 +08:00
2025-12-29 10:03:27 +08:00
2026-03-07 18:19:04 +08:00
2026-02-02 22:13:50 +08:00
2026-06-26 10:36:09 +08:00
2026-03-03 16:11:05 +08:00
2025-12-30 17:13:32 +08:00
2026-01-03 06:34:00 -08:00
2026-01-11 21:54:52 -08:00
2026-03-27 14:33:05 +08:00
2026-03-27 14:33:05 +08:00
2026-02-02 22:13:50 +08:00
2026-01-03 06:36:35 -08:00
2026-01-03 10:52:24 +08:00
2025-12-25 16:01:17 +08:00
2025-12-25 17:15:01 +08:00
2026-04-23 14:53:57 +08:00
2026-07-07 18:53:56 +08:00
2026-07-07 18:53:56 +08:00
2026-02-02 22:13:50 +08:00
2026-02-28 15:01:20 +08:00
2026-02-28 15:01:20 +08:00
2026-03-21 01:23:20 +08:00
2026-05-30 17:52:18 +08:00
2026-07-03 21:02:32 +08:00
2026-07-01 19:01:30 +08:00
2026-04-09 18:14:28 +08:00
2026-06-24 23:43:03 +08:00
2026-03-12 18:38:09 +08:00
2026-07-03 21:02:32 +08:00
2026-01-01 19:09:06 +08:00
2026-04-23 16:34:37 +08:00
2026-07-07 10:04:38 +08:00
2026-07-07 10:04:38 +08:00
2026-05-29 17:19:15 +08:00
2026-06-30 13:22:27 +08:00
2026-05-26 10:49:20 +08:00
2026-05-29 17:19:15 +08:00
2026-05-29 17:19:15 +08:00
2026-05-26 10:49:20 +08:00
2026-04-22 13:22:33 +08:00
2026-04-22 14:56:56 +08:00
2026-04-22 14:56:56 +08:00
2026-06-08 22:54:01 +08:00
2026-06-06 10:28:28 +08:00
2026-04-21 00:13:40 +08:00
2026-04-22 16:38:36 +08:00
2026-05-30 17:52:18 +08:00
2026-04-21 10:13:28 -07:00
2026-04-22 02:42:43 +08:00
2026-06-22 10:30:27 +08:00
2026-04-23 16:34:37 +08:00
2026-07-01 22:19:21 +08:00
2026-07-01 22:19:21 +08:00
2026-07-04 05:30:50 +08:00