From 1e3bcc968880671003443cc1d2cfc7813b22875f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 12 Oct 2026 01:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E6=B4=AA=E6=B0=B4=E6=94=B6?= =?UTF-8?q?=E5=8F=A3(=E8=B4=A7=E6=BA=90+=E5=A4=96=E8=A7=82):=20=E3=80=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=98=AF=E8=BF=90=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E3=80=8D4=20=E5=A4=84=E5=87=BA=E5=8F=A3=E5=BD=92=E4=B8=80?= =?UTF-8?q?=E8=BF=9B=20TaskResultAdmission=E2=80=94=E2=80=94=E7=9C=9F?= =?UTF-8?q?=E7=BB=88=E6=80=81(SUCCESS/FAILED)=E5=B8=A6=2040901=EF=BC=8C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=99=A8=E6=8C=89=E5=B9=82?= =?UTF-8?q?=E7=AD=89=E6=88=90=E5=8A=9F=E5=9B=9E=20success=3Dtrue=EF=BC=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8D=AE=E6=AD=A4=E5=88=A0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=89=AF=E6=9C=AC=E5=81=9C=E6=AD=A2=E8=A1=A5=E5=8F=91?= =?UTF-8?q?=EF=BC=9BPENDING=20=E4=B8=8D=E5=B8=A6=E7=A0=81=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E5=8F=AF=E9=87=8D=E8=AF=95(=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E5=B0=B1=E5=86=99=E5=AE=83=EF=BC=8C=E5=88=A4=E6=AD=BB=3D?= =?UTF-8?q?=E4=B8=A2=E8=BF=98=E8=83=BD=E9=80=81=E5=88=B0=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9E=9C)=20=E5=88=A4=E6=8D=AE=3D=E4=B8=A4=E6=9D=A1=E9=93=BE?= =?UTF-8?q?=20setStatus=20=E5=AE=9E=E6=B5=8B=E5=8F=AA=E6=9C=89=20PENDING/R?= =?UTF-8?q?UNNING/SUCCESS/FAILED=EF=BC=8C=E6=95=85=E5=8F=96=20FINISHED=5FO?= =?UTF-8?q?RDERED=20=E4=B8=8D=E5=8F=96=20TERMINAL(=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=80=81=E6=97=A0=E8=AF=81=E6=8D=AE)=EF=BC=9B=E6=91=98?= =?UTF-8?q?=E4=B8=A4=E6=94=AF=E9=87=8D=E5=A4=8D=20helper=20=E4=B8=8E?= =?UTF-8?q?=E5=9B=A0=E6=AD=A4=E7=A9=BA=E8=BD=AC=E7=9A=84=201=20=E5=A4=84?= =?UTF-8?q?=20BusinessCodes=20import=EF=BC=9BTaskDistributedLockService=20?= =?UTF-8?q?=E8=A1=A5=20[task-lock-held]=20=E6=8C=81=E9=94=81=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E7=95=99=E7=97=95(>=3D5s=20info/>=3D60s=20warn)?= =?UTF-8?q?=EF=BC=8C=E6=AD=A4=E5=89=8D=E5=8F=AA=E6=9C=89=20WAIT=5FLLM=20?= =?UTF-8?q?=E9=87=8F=E5=BE=97=E5=87=BA=E6=97=B6=E9=95=BF=20=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=3D=E5=90=8E=E7=AB=AF=E5=85=A8=E9=87=8F=204291=20passe?= =?UTF-8?q?d=200=20failed(skipped=207,=206.0min)=EF=BC=9B=E6=AD=A3?= =?UTF-8?q?=E5=8F=8D=E5=90=84=E4=B8=A4=E6=94=AF=E6=96=B0=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E9=92=89=E6=AD=BB=EF=BC=9B=E5=8F=98=E5=BC=82=20M1=20=E6=91=98?= =?UTF-8?q?=E7=A0=81/M2=20=E5=85=A8=E7=8A=B6=E6=80=81=E5=B8=A6=E7=A0=81?= =?UTF-8?q?=E5=90=84=E6=9D=80=202=20=E7=BA=A2=E3=80=81=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E5=AD=97=E8=8A=82=E4=B8=80=E8=87=B4=EF=BC=9BM3=20=E6=8D=A2?= =?UTF-8?q?=E6=88=90=20TERMINAL=20=E6=97=A0=E4=BA=BA=E5=88=A4=E7=BA=A2=3D?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E7=9B=B2=E5=8C=BA(=E5=86=99=E8=BF=9B?= =?UTF-8?q?=E7=B1=BB=E6=B3=A8=E9=87=8A)=EF=BC=9B=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7=E6=A3=98=E8=BD=AE=209=20=E6=A0=BC=E7=BB=BF(PipelineSu?= =?UTF-8?q?pport=20=E7=BC=A9=E5=9B=9E=201975=20=E8=A1=8C/=E5=9F=BA?= =?UTF-8?q?=E7=BA=BF=201978)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/task/TaskResultAdmission.java | 31 +++++++++++++++++ .../service/AppearancePatentTaskService.java | 5 +-- .../support/SimilarAsinPipelineSupport.java | 5 +-- .../service/TaskDistributedLockService.java | 12 +++++++ ...arancePatentTaskServiceDelegationTest.java | 18 ++++++++++ .../SimilarAsinTaskServiceSubmitTest.java | 33 +++++++++++++++++++ 6 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/common/task/TaskResultAdmission.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/task/TaskResultAdmission.java b/backend-java/src/main/java/com/nanri/aiimage/common/task/TaskResultAdmission.java new file mode 100644 index 000000000..8526ea968 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/common/task/TaskResultAdmission.java @@ -0,0 +1,31 @@ +package com.nanri.aiimage.common.task; + +import com.nanri.aiimage.common.exception.BusinessCodes; +import com.nanri.aiimage.common.exception.BusinessException; + +/** + * 「任务不在运行中」这一句拒绝的统一出口(2026-10-11 现网取证:结果补发洪水单设备一天 14,906 行)。 + * + *

只有真终态才许带 40901:异常处理器对它按幂等成功返回 {@code success=true},客户端见 success=true + * 就删本地副本、停止补发。{@code PENDING} 是建单就写的状态,回传撞上它只是「激活比投递慢一步」, + * 结果必须留着补发——给它判死等于把还能送到的数据丢掉。 + * + *

终态取 {@link TaskStatuses.FileTask#FINISHED_ORDERED}(SUCCESS/FAILED)而不是 {@code TERMINAL}: + * 货源与外观两条链的 {@code setStatus} 实测只出现 PENDING/RUNNING/SUCCESS/FAILED,从不写取消态; + * 把取消态也算成「结果不可能再落到」目前没有证据支撑。 + */ +public final class TaskResultAdmission { + + private TaskResultAdmission() { + } + + /** 任务不在运行中:真终态带 40901 让客户端收口,其余状态(含空值)不带码、保持可重试。 */ + public static void rejectNotRunning(String status) { + // FINISHED_ORDERED 是 List.of(...),contains(null) 直接抛 NPE;这里必须自己挡住, + // 否则摘掉本地 equals 判法之后,空状态会从「可重试拒绝」变成 500。 + if (status != null && TaskStatuses.FileTask.FINISHED_ORDERED.contains(status)) { + throw new BusinessException(BusinessCodes.TASK_ALREADY_FINISHED, "任务不是运行中状态"); + } + throw new BusinessException("任务不是运行中状态"); + } +} 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 4ddbaf362..df9afcf56 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.task.TaskResultAdmission; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.security.AdminAuthSupport; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentExcelParser; @@ -489,7 +490,7 @@ public class AppearancePatentTaskService { } ensureTaskOwnedByCurrentInstance(task, "submit result"); if (!STATUS_RUNNING.equals(task.getStatus())) { - throw new BusinessException("任务不是运行中状态"); + TaskResultAdmission.rejectNotRunning(task.getStatus()); } int chunkIndex = request.getChunkIndex() == null ? 0 : request.getChunkIndex(); @@ -868,7 +869,7 @@ public class AppearancePatentTaskService { throw new BusinessException("任务不存在"); } if (!STATUS_RUNNING.equals(task.getStatus())) { - throw new BusinessException("任务不是运行中状态"); + TaskResultAdmission.rejectNotRunning(task.getStatus()); } ensureTaskOwnedByCurrentInstance(task, "submit result"); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java index 370bab7ce..1151d9cc2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.exception.BusinessCodes; +import com.nanri.aiimage.common.task.TaskResultAdmission; import com.nanri.aiimage.common.service.DistributedJobLockService; import com.nanri.aiimage.config.SimilarAsinProperties; import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto; @@ -526,7 +527,7 @@ public class SimilarAsinPipelineSupport { throw new BusinessException(BusinessCodes.TASK_NOT_FOUND, "任务不存在"); } if (!STATUS_RUNNING.equals(task.getStatus())) { - throw new BusinessException("任务不是运行中状态"); + TaskResultAdmission.rejectNotRunning(task.getStatus()); } ownershipSupport.ensureTaskOwnedByCurrentInstance(task, "submit result"); @@ -567,7 +568,7 @@ public class SimilarAsinPipelineSupport { throw new BusinessException(BusinessCodes.TASK_NOT_FOUND, "任务不存在"); } if (!STATUS_RUNNING.equals(task.getStatus())) { - throw new BusinessException("任务不是运行中状态"); + TaskResultAdmission.rejectNotRunning(task.getStatus()); } ownershipSupport.ensureTaskOwnedByCurrentInstance(task, "submit result"); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java index a732e76bb..51dfe734e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java @@ -26,6 +26,9 @@ public class TaskDistributedLockService { /** 续期失败后的重试次数:容忍 Redis 抖动/主从切换造成的瞬时失败。 */ private static final int RENEW_MAX_ATTEMPTS = 3; private static final long RENEW_RETRY_DELAY_MILLIS = 200L; + /** 持锁时长留痕:任务锁被 LLM 批处理占用是 40902 的来源,此前只有 WAIT_LLM 一支量得出时长。 */ + private static final long HELD_REPORT_MILLIS = 5000L; + private static final long HELD_WARN_MILLIS = 60000L; private final DistributedJobLockService distributedJobLockService; private final ThreadLocal> localLocks = ThreadLocal.withInitial(LinkedHashMap::new); @@ -147,6 +150,7 @@ public class TaskDistributedLockService { private final DistributedJobLockService.LockHandle delegate; private final Duration ttl; + private final long acquiredAtMillis; private ScheduledFuture renewalFuture; private int depth = 1; private volatile boolean closed; @@ -154,6 +158,7 @@ public class TaskDistributedLockService { private HeldLock(DistributedJobLockService.LockHandle delegate, Duration ttl) { this.delegate = delegate; this.ttl = ttl; + this.acquiredAtMillis = System.currentTimeMillis(); } private void close() { @@ -191,7 +196,14 @@ public class TaskDistributedLockService { if (heldLocks.isEmpty()) { localLocks.remove(); } + long heldMillis = System.currentTimeMillis() - heldLock.acquiredAtMillis; heldLock.close(); + if (heldMillis >= HELD_WARN_MILLIS) { + log.warn("[task-lock-held] lockName={} heldMs={} threshold={}ms", + lockName, heldMillis, HELD_WARN_MILLIS); + } else if (heldMillis >= HELD_REPORT_MILLIS) { + log.info("[task-lock-held] lockName={} heldMs={}", lockName, heldMillis); + } } } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java index 66bab8b99..4cc30463a 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java @@ -1,5 +1,6 @@ package com.nanri.aiimage.modules.appearancepatent.service; +import com.nanri.aiimage.common.exception.BusinessCodes; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.service.DistributedJobLockService; import com.nanri.aiimage.config.AppearancePatentProperties; @@ -299,6 +300,23 @@ class AppearancePatentTaskServiceDelegationTest { BusinessException ex = assertThrows(BusinessException.class, () -> service.submitResult(90001L, submitRequest("submission-status"))); assertTrue(ex.getMessage().contains("任务不是运行中状态"), "实际: " + ex.getMessage()); + // 真终态必须带 40901:异常处理器对它幂等回 success=true,客户端据此删本地副本、停止补发。 + // 这一句是本次修复的执行格——不带码就退回"HTTP 200 + 表外 code"那一族,洪水照旧。 + assertEquals(BusinessCodes.TASK_ALREADY_FINISHED, ex.getCode(), + "SUCCESS 任务被拒时没带 40901 ⇒ 客户端仍按瞬时失败无限补发"); + } + + @Test + void test_pending_task_rejection_keeps_retryable_code() throws Exception { + // PENDING 不是终态:建单就写 PENDING,回传撞上它只是"激活慢一步",此时判死=丢还能送到的数据。 + FileTaskEntity t = task("{\"allItems\":[]}"); + t.setStatus("PENDING"); + when(fileTaskMapper.selectById(90001L)).thenReturn(t); + + BusinessException ex = assertThrows(BusinessException.class, + () -> service.submitResult(90001L, submitRequest("submission-pending"))); + assertTrue(ex.getMessage().contains("任务不是运行中状态"), "实际: " + ex.getMessage()); + assertNull(ex.getCode(), "PENDING 被打上终态码 ⇒ 客户端会删掉本地副本,这份结果永久进不去"); } // ---------- 6 owner 检查不动 ---------- diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceSubmitTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceSubmitTest.java index 6ee9ea7bc..fdd2c5c94 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceSubmitTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceSubmitTest.java @@ -1,6 +1,8 @@ package com.nanri.aiimage.modules.similarasin.service; import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.exception.BusinessCodes; +import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.service.DistributedJobLockService; import com.nanri.aiimage.config.InstanceMetadata; import com.nanri.aiimage.config.SimilarAsinProperties; @@ -50,6 +52,7 @@ import java.util.concurrent.atomic.AtomicReference; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -271,6 +274,36 @@ class SimilarAsinTaskServiceSubmitTest { anyString(), anyLong(), anyString(), any(), anyString()); } + @Test + void submitResultOnFinishedTaskIsRejectedWithTerminalCode() throws Exception { + // 真终态被拒必须带 40901:异常处理器对它幂等回 success=true,客户端据此删本地副本、停止补发。 + // 不带码就退回「HTTP 200 + 表外 code」那一族,回传洪水照旧。 + FileTaskEntity task = runningTask("instance-a"); + task.setStatus("SUCCESS"); + when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task); + + BusinessException ex = assertThrows(BusinessException.class, + () -> service.submitResult(TASK_ID, request(false))); + assertTrue(ex.getMessage().contains("任务不是运行中状态"), "实际: " + ex.getMessage()); + assertEquals(BusinessCodes.TASK_ALREADY_FINISHED, ex.getCode(), + "终态任务被拒时没带 40901 ⇒ 客户端仍按瞬时失败无限补发"); + } + + @Test + void submitResultOnPendingTaskStaysRetryableWithoutTerminalCode() throws Exception { + // PENDING 不是终态:建单就写 PENDING,回传撞上它只是「激活比投递慢一步」, + // 此时判死等于把还能送到的数据丢掉。 + FileTaskEntity task = runningTask("instance-a"); + task.setStatus("PENDING"); + when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task); + + BusinessException ex = assertThrows(BusinessException.class, + () -> service.submitResult(TASK_ID, request(false))); + assertTrue(ex.getMessage().contains("任务不是运行中状态"), "实际: " + ex.getMessage()); + assertNull(ex.getCode(), + "PENDING 被打上终态码 ⇒ 客户端会删掉本地副本,这份结果永久进不去"); + } + private String parsedPayloadJson(List rows) throws Exception { SimilarAsinParsedPayloadDto payload = new SimilarAsinParsedPayloadDto(); payload.setAllItems(rows);