Merge pull request 'fix: 写库重试 3→5 次、退避拉长至 1/3/7/15/30s' (#9 ) from inkreach/harden-db-write-retry into main

Reviewed-on: #9
fix: 写库重试 3→5 次、退避拉长至 1/3/7/15/30s
2026-10-15 07:00:22 +00:00 · 2026-10-10 09:08:01 +00:00 · 2026-09-28 07:29:10 +00:00 · 2026-09-28 03:19:29 +00:00 · 2026-09-28 03:04:39 +00:00 · 2026-09-24 03:56:05 +00:00
3 changed files with 6 additions and 2 deletions
@@ -25,8 +25,9 @@ LOOKUP_BATCH = 10000
 # 单锁无环,写事务之间从结构上不可能死锁。1768851058 = "inkr" 的 ASCII 整数表示。
 DB_WRITE_LOCK_KEY = 1768851058
 LOCK_TIMEOUT = "15s"                          # 等锁超时 → LockNotAvailable → 交给重试兜底
-WRITE_RETRIES = 3                             # 死锁/等锁超时的整事务重试次数
-WRITE_RETRY_BACKOFF = [1, 3, 7]               # 重试退避(秒)
+WRITE_RETRIES = 5                             # 死锁/等锁超时的整事务重试次数(外部写者如 17track
+                                              # 物流回写不走 advisory 锁,冲突窗口可达分钟级,重试需够深)
+WRITE_RETRY_BACKOFF = [1, 3, 7, 15, 30]       # 重试退避(秒;末位预留,最后一次失败直接抛出)
 WRITE_RETRYABLE_ERRORS = (pg_errors.DeadlockDetected, pg_errors.LockNotAvailable)


@@ -35,6 +35,8 @@ RIIN_GOODS_STATUS_MAP: dict[str, str] = {
    "CANCELLED": "已取消", "REFUNDING": "退款中",
    # 商品级状态复用平台状态枚举,COMPLETE/PAUSE 缺失曾导致 1/3 商品行 status 为 NULL
    "COMPLETE": "已完成", "PAUSE": "暂停",
+    # CLOSE 同为商品终态(Goods 约束无"已关闭",取"已取消");UNKNOWN 保留 NULL 并由告警暴露
+    "CLOSE": "已取消",
 }

 RIIN_PLATFORM_STATUS_MAP: dict[str, str] = {
@@ -53,6 +53,7 @@ class RiinGoodsStatusTest(unittest.TestCase):
            "REFUNDING": "退款中",
            "COMPLETE": "已完成",  # 本次补齐(曾导致 NULL)
            "PAUSE": "暂停",       # 本次补齐(曾导致 NULL)
+            "CLOSE": "已取消",     # 回填重拉时告警发现的新枚举
        }
        for raw, want in cases.items():
            with self.subTest(raw=raw):
Author	SHA1	Message	Date
inkreach	e4885803df	Merge pull request 'fix: 写库重试 3→5 次、退避拉长至 1/3/7/15/30s' (#9 ) from inkreach/harden-db-write-retry into main Reviewed-on: #9	2026-10-15 07:00:22 +00:00
yeuimu	e5175a0504	fix: 写库重试 3→5 次、退避拉长至 1/3/7/15/30s CI / test (pull_request) Successful in 4m30s Details sceptical-finch(riin-recent-sync 10-10 16:04)失败复盘:17track 物流回写 (宿主机本地进程,不走 advisory 锁)与 sync 写库在 panel 触发器链 (panel.orders/dims/dims_daily)上交叉持锁,冲突窗口持续约 3 分钟, 原 3 次重试(1/3/7s)全部耗尽。加深重试使其可跨过分钟级外部冲突窗口。	2026-10-10 09:08:01 +00:00
inkreach	489dacca49	Merge pull request 'Develop' (#8 ) from inkreach/develop into main Reviewed-on: #8	2026-09-28 07:29:10 +00:00
yeuimu	5eacfefb6c	fix: RIIN 商品状态补 CLOSE=已取消(重拉残留时告警发现的新枚举;UNKNOWN 保留 NULL) CI / test (pull_request) Successful in 2m8s Details	2026-09-28 03:19:29 +00:00
inkreach	63d30d8f25	Merge pull request 'fix: RIIN 商品状态补 COMPLETE/PAUSE 映射,修复 Goods.status 大面积 NULL' (#7 ) from inkreach/fix/riin-goods-status-map into develop CI / test (pull_request) Successful in 48s Details Reviewed-on: #7	2026-09-28 03:04:39 +00:00
inkreach	fff5b707ac	Merge pull request 'feat: OCR 新增支持西班牙/意大利/加拿大(ES/IT/CA)' (#6 ) from inkreach/ocr-es-it-ca into main Reviewed-on: #6	2026-09-24 03:56:05 +00:00
rom	d07c67327e	Merge pull request 'Develop' (#5 ) from develop into main Reviewed-on: #5	2026-09-23 03:46:14 +00:00
rom	9c76772969	Merge pull request 'Develop' (#4 ) from develop into main Reviewed-on: #4	2026-09-20 09:04:49 +00:00
inkreach	a83b89b08a	Merge pull request 'Develop' (#3 ) from develop into main Reviewed-on: #3	2026-09-17 09:31:45 +00:00