fix(task-retry): 已交付代点重试不再空转(B96-08)

This commit is contained in:
2026-11-12 15:18:34 +08:00
parent a940cd227f
commit ad33b7d54c
7 changed files with 235 additions and 25 deletions
@@ -82,6 +82,21 @@ class StaleTaskDeathReasonTest {
assertFalse(reason.contains("未回传任何检测结果"), reason);
}
/**
* B96-08:直链已经挂上的单再说「结果文件未能生成」就是把已交付说成没交付。
* 33879 的终态文案正是这个形状——用户据此以为三代重采全白跑(其实表 06:56 就交付过)。
*/
@Test
void deliveredResultFileIsNotReportedAsMissing() {
String reason = new StaleTaskDeathReason(0L, T, T, "Linux后台抓取: 4000/4000", false, true, true, 30).describe();
assertTrue(reason.contains("已上传完全部结果"), reason);
assertTrue(reason.contains("结果文件已生成"), reason);
assertFalse(reason.contains("未能生成"), reason);
// 证据链照旧:分片数虽然被交付清理成 0,心跳与位置仍要写出来
assertTrue(reason.contains("最后心跳 10-01 12:34"), reason);
assertTrue(reason.contains("最后上报 Linux后台抓取: 4000/4000"), reason);
}
/**
* 2026-11-10 慧赢2 的 33827:建单后 30 分钟没有任何采集槽位认领(采集机该窗全程无日志),
* 却被写成「无进展」,用户无从判断是自己的数据问题还是排队。零位置文本时补一句成因提示,
@@ -1,18 +1,21 @@
package com.nanri.aiimage.modules.task.service;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.nanri.aiimage.common.exception.BusinessException;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskFileJobMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import org.mockito.ArgumentCaptor;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -46,6 +49,9 @@ class TaskInPlaceRetryServiceTest {
// 「继续」的作业复位走 TaskFileJobEntity 的 lambda 条件更新,同样要注册元数据
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
TaskFileJobEntity.class);
// 形状分档要按 biz_task_chunk 计数(分片还在 / 已被交付清理)
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
TaskChunkEntity.class);
}
private static FileTaskEntity failedTask() {
@@ -63,15 +69,21 @@ class TaskInPlaceRetryServiceTest {
TaskFileJobService jobs) {
// 2026-11-03 起「继续」多带两枚依赖:作业 mapper(复位中断已交付的 SUCCESS 作业)
// 与 handler 注册表(清模块补检预算)。失败重试路径不触这两枚,mock 即可。
return service(mapper, results, jobs, mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class));
return service(mapper, results, mock(TaskChunkMapper.class), jobs,
mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class));
}
private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results,
TaskFileJobService jobs, TaskFileJobMapper jobMapper,
ResultFileJobHandlerRegistry registry) {
TaskInPlaceRetryService svc = new TaskInPlaceRetryService(mapper, results, jobs, jobMapper, registry);
ReflectionTestUtils.setField(svc, "fileTaskMapper", mapper);
return svc;
return service(mapper, results, mock(TaskChunkMapper.class), jobs, jobMapper, registry);
}
private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results,
TaskChunkMapper chunks, TaskFileJobService jobs,
TaskFileJobMapper jobMapper,
ResultFileJobHandlerRegistry registry) {
return new TaskInPlaceRetryService(mapper, results, chunks, jobs, jobMapper, registry);
}
@Test
@@ -166,25 +178,101 @@ class TaskInPlaceRetryServiceTest {
void 失败任务重试也要复位上一代已交付的出表作业() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskChunkMapper chunks = mock(TaskChunkMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
when(mapper.update(isNull(), any())).thenReturn(1);
when(chunks.selectCount(any())).thenReturn(364L);
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,
boolean ok = service(mapper, results, chunks, jobs, jobMapper,
mock(ResultFileJobHandlerRegistry.class)).retryInPlace(failedTask());
assertTrue(ok);
// 已交付作业被复位成 PENDING(下一轮才排得上出表)
verify(jobMapper).update(isNull(), any());
// 失败保留直链:只清旧错误文案,不清下载直链(用户手上那份还能下)
verify(results, times(1)).update(isNull(), any());
// 结果行两次 update:清上一代直链(让位给新表)+清旧错误文案。旧写法这里只清错误文案、
// 直链留着「因为上一份可能已经可用」,正是 B96-08 让三代重采全白干的那一格。
verify(results, times(2)).update(isNull(), any());
verify(jobs).resetTerminalFailedForRecovery(eq(32967L), eq("APPEARANCE_PATENT"), eq(36758L));
}
/**
* 形状 (a):分片还在(33880 364 行、33898 275 行)。FAILED 分支必须与 CANCELLED 同口径清直链——
* 不清则复位后的作业被交付闸「直链非空即跳过」在 2 秒内标回 SUCCESS,新一代永远组装不了。
*
* <p><b>顺序也是判据</b>:直链必须先清、作业才能复位成 PENDING。反过来的话,worker 在两步之间
* 领到作业,看到的仍是上一代的直链,于是照旧被交付闸短路——空转一秒不差地重演一遍。
* 交付闸本身刻意保持「只认直链」(31527 那 45 秒五次空表就靠它挡着),所以这条顺序是唯一的解。
*/
@Test
void 失败任务重试必须清掉上一代直链_否则新一代永远组装不了() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskChunkMapper chunks = mock(TaskChunkMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
when(mapper.update(isNull(), any())).thenReturn(1);
when(chunks.selectCount(any())).thenReturn(364L);
FileResultEntity result = new FileResultEntity();
result.setId(36809L);
result.setResultFileUrl("appearance-patent/2026/11/33879-result.xlsx");
when(results.selectOne(any())).thenReturn(result);
when(jobMapper.selectOne(any())).thenReturn(deliveredJob());
boolean ok = service(mapper, results, chunks, jobs, jobMapper,
mock(ResultFileJobHandlerRegistry.class)).retryInPlace(failedTask());
assertTrue(ok);
ArgumentCaptor<LambdaUpdateWrapper> captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
verify(results, times(2)).update(isNull(), captor.capture());
assertTrue(captor.getAllValues().stream()
.anyMatch(wrapper -> String.valueOf(wrapper.getSqlSet()).contains("result_file_url")),
"清直链那一次更新必须真的发生:只有清错误文案的话,交付闸仍会短路");
// 顺序:清直链(结果行 update,第一次)必须早于作业复位(作业行 update)
org.mockito.InOrder order = org.mockito.Mockito.inOrder(results, jobMapper);
order.verify(results).update(isNull(), any());
order.verify(jobMapper).update(isNull(), any());
}
/**
* 形状 (b):分片已被上一轮交付清理、直链还挂着(33879)。这一单的活其实干完了,
* 重试该「补终态 + 保留文件」,不是排回 PENDING 再空转一轮(B96-08 第 2 条修法)。
*/
@Test
void 分片已被交付清理且直链还挂着时重试补终态而不是重排() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskChunkMapper chunks = mock(TaskChunkMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
when(mapper.update(isNull(), any())).thenReturn(1);
when(chunks.selectCount(any())).thenReturn(0L);
FileResultEntity result = new FileResultEntity();
result.setId(36809L);
result.setResultFileUrl("appearance-patent/2026/11/33879-result.xlsx");
when(results.selectOne(any())).thenReturn(result);
boolean ok = service(mapper, results, chunks, jobs, jobMapper,
mock(ResultFileJobHandlerRegistry.class)).retryInPlace(failedTask());
assertTrue(ok);
ArgumentCaptor<LambdaUpdateWrapper> captor = ArgumentCaptor.forClass(LambdaUpdateWrapper.class);
verify(mapper, times(1)).update(isNull(), captor.capture());
LambdaUpdateWrapper wrapper = captor.getValue();
assertTrue(String.valueOf(wrapper.getSqlSet()).contains("status="), "必须落任务状态");
assertTrue(wrapper.getParamNameValuePairs().containsValue("SUCCESS"),
"补终态=收成成功(文件保留),不是排回 PENDING");
// 代数不推进、作业与结果行一概不动:这一单没有第二代要跑
assertFalse(String.valueOf(wrapper.getSqlSet()).contains("resume_attempt"), "补终态不是重跑,代数不该 +1");
verify(jobMapper, never()).update(isNull(), any());
verify(results, never()).update(isNull(), any());
verify(jobs, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong());
}
@Test
void 失败任务没有已交付作业时不动物业行() {
FileTaskMapper mapper = mock(FileTaskMapper.class);