fix(task): 失败重试也复位已交付出表作业,判死文案按「客户端是否交完」分档

This commit is contained in:
2026-11-10 11:49:43 +08:00
parent 7ce6ff64cc
commit bd0c0a0810
6 changed files with 138 additions and 14 deletions
@@ -13,7 +13,7 @@ class StaleTaskDeathReasonTest {
@Test
void neverUploadedSaysNoResultUploadedNotThatPythonCrashed() {
String reason = new StaleTaskDeathReason(0L, null, T, null, false, 30).describe();
String reason = new StaleTaskDeathReason(0L, null, T, null, false, false, 30).describe();
assertTrue(reason.contains("未回传任何检测结果"), reason);
assertTrue(reason.contains("超过 30 分钟无进展"), reason);
assertTrue(reason.contains("最后心跳 10-01 12:34"), reason);
@@ -23,21 +23,23 @@ class StaleTaskDeathReasonTest {
@Test
void queuedTaskIsToldApartFromACrashedOneByTheReportedPhase() {
String reason = new StaleTaskDeathReason(0L, null, T, "排队等待空闲槽位", false, 30).describe();
String reason = new StaleTaskDeathReason(0L, null, T, "排队等待空闲槽位", false, false, 30).describe();
assertTrue(reason.contains("最后上报 排队等待空闲槽位"), reason);
assertFalse(reason.contains("已收到"), reason);
// 有位置文本=客户端开过工,不得再挂「等待采集槽位」那半句
assertFalse(reason.contains("等待采集槽位"), reason);
}
@Test
void missingHeartbeatAndBlankPhaseDegradeQuietly() {
String reason = new StaleTaskDeathReason(0L, null, null, " ", false, 30).describe();
String reason = new StaleTaskDeathReason(0L, null, null, " ", false, false, 30).describe();
assertTrue(reason.contains("最后心跳 时间未知"), reason);
assertFalse(reason.contains("最后上报"), reason);
}
@Test
void interruptedUploadReportsChunksAndLastChunkTime() {
String reason = new StaleTaskDeathReason(7L, T, T, "第 120/500 组", false, 30).describe();
String reason = new StaleTaskDeathReason(7L, T, T, "第 120/500 组", false, false, 30).describe();
assertTrue(reason.contains("客户端回传中断"), reason);
assertTrue(reason.contains("已收到 7 个分片,最后一次 10-01 12:34"), reason);
assertTrue(reason.contains("最后上报 第 120/500 组"), reason);
@@ -46,21 +48,48 @@ class StaleTaskDeathReasonTest {
@Test
void exhaustedFileJobBlamesFileGenerationInsteadOfTheClient() {
String reason = new StaleTaskDeathReason(7L, T, T, "第 120/500 组", true, 30).describe();
String reason = new StaleTaskDeathReason(7L, T, T, "第 120/500 组", true, false, 30).describe();
assertTrue(reason.contains("结果文件生成多次失败"), reason);
assertFalse(reason.contains("回传中断"), reason);
}
@Test
void exhaustedFileJobWithoutAnyChunkStillReportsClientSilence() {
String reason = new StaleTaskDeathReason(0L, null, T, null, true, 30).describe();
String reason = new StaleTaskDeathReason(0L, null, T, null, true, false, 30).describe();
assertTrue(reason.contains("未回传任何检测结果"), reason);
assertFalse(reason.contains("结果文件生成"), reason);
}
@Test
void nonPositiveTimeoutNeverPrintsZeroMinutes() {
assertTrue(new StaleTaskDeathReason(0L, null, null, null, false, 0)
assertTrue(new StaleTaskDeathReason(0L, null, null, null, false, false, 0)
.describe().contains("超过 1 分钟"));
}
/**
* 2026-11-10 现网 33828/33758 的形状:采集侧末分片 done=true 已上传成功
* (worker 日志「任务处理完成,抓取失败 0 行」),出表作业却停在上一代的 SUCCESS 上没被复位,
* 于是永不出表、心跳停了 30 分钟被判死。原文案「客户端回传中断」把责任判给了客户端,
* 与其实际行为相反,排查方向被带偏(用户以为是采集没传完)。
*/
@Test
void submissionCompletedTaskBlamesFileGenerationNotTheClient() {
String reason = new StaleTaskDeathReason(12L, T, null, "Linux后台抓取: 98/99", false, true, 30).describe();
assertTrue(reason.contains("已上传完全部结果"), reason);
assertTrue(reason.contains("结果文件未能生成"), reason);
assertTrue(reason.contains("已收到 12 个分片,最后一次 10-01 12:34"), reason);
assertFalse(reason.contains("回传中断"), reason);
assertFalse(reason.contains("未回传任何检测结果"), reason);
}
/**
* 2026-11-10 慧赢2 的 33827:建单后 30 分钟没有任何采集槽位认领(采集机该窗全程无日志),
* 却被写成「无进展」,用户无从判断是自己的数据问题还是排队。零位置文本时补一句成因提示,
* 且措辞只到「可能」——没认领这件事本身无法从这两列证明。
*/
@Test
void neverUploadedWithoutAnyPositionHintsQueuedForCollectorSlot() {
String reason = new StaleTaskDeathReason(0L, null, T, null, false, false, 30).describe();
assertTrue(reason.contains("可能一直在等待采集槽位"), reason);
}
}
@@ -156,6 +156,52 @@ class TaskInPlaceRetryServiceTest {
verify(handler, never()).onTaskResumed(anyLong());
}
/**
* 2026-11-10 现网 33828/33758:上一代**已经出过表**(组装作业停在 SUCCESS)的任务判失败后,
* 重试若不复位那行作业,enqueueAssembleResult 每次原样拿回它、永不出表——采集侧把结果全部传完
* (worker 日志「任务处理完成 99/99」)也轮不到出表,30 分钟没心跳再被判一次,
* 还写成「客户端回传中断」。失败代与中断代的差别只在直链清不清,作业复位两边都要做。
*/
@Test
void 失败任务重试也要复位上一代已交付的出表作业() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
when(mapper.update(isNull(), any())).thenReturn(1);
FileResultEntity result = new FileResultEntity();
result.setId(36758L);
when(results.selectOne(any())).thenReturn(result);
when(jobMapper.selectOne(any())).thenReturn(deliveredJob());
boolean ok = service(mapper, results, jobs, jobMapper,
mock(ResultFileJobHandlerRegistry.class)).retryInPlace(failedTask());
assertTrue(ok);
// 已交付作业被复位成 PENDING(下一轮才排得上出表)
verify(jobMapper).update(isNull(), any());
// 失败保留直链:只清旧错误文案,不清下载直链(用户手上那份还能下)
verify(results, times(1)).update(isNull(), any());
verify(jobs).resetTerminalFailedForRecovery(eq(32967L), eq("APPEARANCE_PATENT"), eq(36758L));
}
@Test
void 失败任务没有已交付作业时不动物业行() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
when(mapper.update(isNull(), any())).thenReturn(1);
FileResultEntity result = new FileResultEntity();
result.setId(36758L);
when(results.selectOne(any())).thenReturn(result);
when(jobMapper.selectOne(any())).thenReturn(null);
service(mapper, results, mock(TaskFileJobService.class), jobMapper,
mock(ResultFileJobHandlerRegistry.class)).retryInPlace(failedTask());
verify(jobMapper, never()).update(isNull(), any());
}
@Test
void 成功任务不可继续() {
FileTaskMapper mapper = mock(FileTaskMapper.class);