回传洪水收口(货源+外观): 「任务不是运行中」4 处出口归一进 TaskResultAdmission——真终态(SUCCESS/FAILED)带 40901,异常处理器按幂等成功回 success=true,客户端据此删本地副本停止补发;PENDING 不带码保持可重试(建单就写它,判死=丢还能送到的结果)

判据=两条链 setStatus 实测只有 PENDING/RUNNING/SUCCESS/FAILED,故取 FINISHED_ORDERED 不取 TERMINAL(取消态无证据);摘两支重复 helper 与因此空转的 1 处 BusinessCodes import;TaskDistributedLockService 补 [task-lock-held] 持锁时长留痕(>=5s info/>=60s warn),此前只有 WAIT_LLM 量得出时长
验证=后端全量 4291 passed 0 failed(skipped 7, 6.0min);正反各两支新用例钉死;变异 M1 摘码/M2 全状态带码各杀 2 红、还原字节一致;M3 换成 TERMINAL 无人判红=已知盲区(写进类注释);可读性棘轮 9 格绿(PipelineSupport 缩回 1975 行/基线 1978)
This commit is contained in:
2026-10-12 01:22:43 +08:00
parent b0829db81e
commit 1e3bcc9688
6 changed files with 100 additions and 4 deletions
@@ -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 检查不动 ----------
@@ -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<SimilarAsinParsedRowVo> rows) throws Exception {
SimilarAsinParsedPayloadDto payload = new SimilarAsinParsedPayloadDto();
payload.setAllItems(rows);