fix(similar-asin): 迟到回传重开超时判死任务,收尾复位组装 job

心跳判死巡检只改任务状态,客户端继续补发时被 40901 拒绝并删本地
副本;线上 31577/31472 的 214 行结果分片整批丢失。24 小时内、仅
心跳/回传停滞类判死文案的 FAILED 任务,收到迟到分片时条件重开为
RUNNING;业务失败与 SUCCESS 仍按终态拒绝。

判死巡检会把组装 job 一并写成 FAILED+retry=max,底座不会自动重排;
收尾进入等组装态时复位它,避免重开后卡在 RUNNING。
This commit is contained in:
2026-10-21 10:19:34 +08:00
parent 73838916ef
commit f5e5717443
2 changed files with 173 additions and 0 deletions
@@ -45,6 +45,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -274,6 +275,93 @@ class SimilarAsinTaskServiceSubmitTest {
anyString(), anyLong(), anyString(), any(), anyString());
}
@Test
void lateResultReopensStaleFailedTaskInsteadOfDroppingIt() throws Exception {
// 生产 31577/31472:心跳超时判死后客户端继续补发,旧逻辑回 40901,客户端删本地副本,
// 已采数据整批丢失。迟到分片到达时应先把任务拉回 RUNNING,再正常落库。
FileTaskEntity task = runningTask("instance-a");
task.setStatus("FAILED");
task.setErrorMessage("任务心跳超时,已自动失败");
task.setFinishedAt(LocalDateTime.now().minusMinutes(30));
task.setFailedFileCount(1);
AtomicBoolean reopened = new AtomicBoolean();
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
when(fileTaskMapper.update(any(), any())).thenAnswer(invocation -> {
reopened.set(true);
task.setStatus("RUNNING");
task.setErrorMessage(null);
task.setFinishedAt(null);
return 1;
});
configureNewChunkAndScope();
configureChunkStore(false);
when(taskChunkMapper.selectCount(any())).thenReturn(1L);
service.submitResult(TASK_ID, request(false));
assertTrue(reopened.get(), "心跳超时判死的任务收到迟到分片必须先重开,而不是 40901 丢数据");
assertEquals("RUNNING", task.getStatus());
verify(taskCacheService).touchTaskHeartbeat(TASK_ID);
}
@Test
void lateFinalResultResetsTerminalFailedAssembleJob() throws Exception {
// 判死巡检把组装 job 一起写成 FAILED+retryCount=max;迟到 done 重开后若不复位,
// finalizeTask 只把任务挂回 RUNNING,组装永远不会再跑。31577/31472 正是这个形状。
FileTaskEntity task = runningTask("instance-a");
task.setStatus("FAILED");
task.setErrorMessage("任务心跳超时,已自动失败");
task.setFinishedAt(LocalDateTime.now().minusMinutes(30));
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
when(fileTaskMapper.update(any(), any())).thenAnswer(invocation -> {
task.setStatus("RUNNING");
task.setErrorMessage(null);
task.setFinishedAt(null);
return 1;
});
configureNewChunkAndScope();
when(taskChunkMapper.selectCount(any())).thenReturn(1L);
when(transientPayloadStorageService.storeChunkPayloadVersioned(
eq(SimilarAsinTaskService.MODULE_TYPE), eq(TASK_ID), anyString(), eq(0), anyString()))
.thenReturn(STORED_CHUNK_POINTER);
when(transientPayloadStorageService.wasLastStoreLocalFallback()).thenReturn(false);
String parsedPayload = parsedPayloadJson(List.of(new SimilarAsinParsedRowVo()));
when(transientPayloadStorageService.resolvePayload(eq(PARSED_POINTER), anyString()))
.thenReturn(parsedPayload);
FileResultEntity result = new FileResultEntity();
result.setId(501L);
result.setTaskId(TASK_ID);
result.setModuleType(SimilarAsinTaskService.MODULE_TYPE);
result.setSourceFilename("germany.xlsx");
when(fileResultMapper.selectList(any())).thenReturn(List.of(result));
// 先来一个中间分片:任务在这里被重开;随后 done 到达时状态已是 RUNNING,
// 不能再用「本次请求是否发生重开」决定要不要复位组装 job。
service.submitResult(TASK_ID, request(false));
assertEquals("RUNNING", task.getStatus(), "中间分片应先把判死任务重开");
service.submitResult(TASK_ID, request(true));
assertEquals("RUNNING", task.getStatus(), "迟到 done 收尾后应进入等待组装态");
verify(taskFileJobService).resetTerminalFailedForRecovery(
TASK_ID, SimilarAsinTaskService.MODULE_TYPE, 501L);
}
@Test
void businessFailedTaskStillRejectsLateResultWithTerminalCode() throws Exception {
// 只有客户端停滞类判死可重开;结果文件生成失败等业务失败仍按终态收口。
FileTaskEntity task = runningTask("instance-a");
task.setStatus("FAILED");
task.setErrorMessage("相似ASIN结果文件生成失败");
task.setFinishedAt(LocalDateTime.now().minusMinutes(30));
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task);
BusinessException ex = assertThrows(BusinessException.class,
() -> service.submitResult(TASK_ID, request(false)));
assertEquals(BusinessCodes.TASK_ALREADY_FINISHED, ex.getCode());
verify(fileTaskMapper, never()).update(any(), any());
}
@Test
void submitResultOnFinishedTaskIsRejectedWithTerminalCode() throws Exception {
// 真终态被拒必须带 40901:异常处理器对它幂等回 success=true,客户端据此删本地副本、停止补发。