From c8fc8c619bd8d47d41f991eee742dfabd4667de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 20 Oct 2026 02:26:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(appearance-patent):=20=E4=B8=89=E6=9D=A1?= =?UTF-8?q?=E8=A1=A5=E6=A3=80=E6=97=A5=E5=BF=97=E5=88=AB=E5=86=8D=E5=86=92?= =?UTF-8?q?=E7=94=A8=E3=80=8C=E5=88=A4=E6=AD=BB=E3=80=8D=E6=8E=AA=E8=BE=9E?= =?UTF-8?q?=E2=80=94=E2=80=94=E8=A2=AB=E6=8E=A8=E9=80=81=E9=97=B8=E9=97=A8?= =?UTF-8?q?=E5=BD=93=E5=9C=BA=E6=8A=93=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pre-push 闸门(四面)判红两格,两格同因、且都是本会话前三笔自己添的账: 新写的 log.warn 字面量里带「判死」,但那三条说的是补检调度,不是任务判死—— 交付缺口补检排不上队,转判死出口按补检预算处置 判死出口补检重排未接上,按已有结果交付 判死出口触发补检轮 `_prod_watch.py` 的告警签名是 ('任务判死', '改判死|接管判死'),而 test_deadjudge_signature_is_precise 要求每条含「判死」的 java 日志要么被签名算成死、 要么挂 BY_DESIGN 标记。这三条两头都不沾 ⇒ 签名与 java 措辞脱钩,巡检会把补检调度 报成任务判死(正是这条尺存在的理由:告警面宁可少报也不能错报)。 改法是动措辞、不动判据:三条日志与相关注释统一改用本仓既有词汇「失败兜底出口」 (fallbackAssembleResultFile 的 javadoc 一直这么叫),签名与放宽闸一格没碰。 复跑:test_deadjudge_signature_is_precise 6 passed;ops 整量 500 passed(正好踩下限); AppearancePatent* 258 例/0 红 BUILD SUCCESS。 ⚠ 另记本会话一处操作失误:前两次 git push 我误判成"卡在鉴权"各杀了一次,实际是 pre-push 四面闸门在正常跑十几分钟(客户端 674s/用户端 410s/后端 367s/后管 275s)。 被杀的只是我自己的门禁时间,闸门没被绕过——第三次是让它跑完才拿到这两格红的。 --- .../service/AppearancePatentTaskService.java | 8 ++++---- .../service/AppearancePatentDeliveryGateTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index 2522cf70a..e62172ee8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -1725,7 +1725,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline{@link #fallbackAssembleResultFile} 的注释原来断言「作业已判死,缺口不再有补齐窗口」, * 现网读数证明它是假的:底座早就有 {@code resetTerminalFailedForRecovery}(终态失败且 retry @@ -1781,13 +1781,13 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline rows = sheetRows(2); AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true)); when(taskFileJobService.requeue(anyLong(), any())).thenReturn(false); @@ -361,7 +361,7 @@ class AppearancePatentDeliveryGateTest { verify(taskFileJobService, never()).requeue(anyLong(), any()); } - // ---------- 判死出口的补检预算 ---------- + // ---------- 失败兜底出口的补检预算 ---------- @Test void deadJobWithGapIsRequeuedOnItsOwnBudgetInsteadOfShipping() throws Exception {