fix(任务恢复): 停止意图优先于自动续跑 + 未覆盖模块的中断可见
自查上一提交时发现两处遗漏: - 用户点了「停止循环」而子任务恰好因客户端中断失败时,续派逻辑跑在停止检查之前, 会把循环从停止意图里拉回 RUNNING 自己转起来。改为停止请求优先:直接 STOPPED。 - 模块不支持自动续跑的中断任务此前完全无痕迹(用户只看到失败)。 这类模块(上架/改价/审批/商品管理采集/跟价非循环任务)的续跑载荷需要用户在页面上 选的执行参数(ziniao_version 等),而这份选择只存在于派发那一刻的浏览器里、没落到 request_json —— 自动重排队会用错参数,所以它们**不纳入**续跑(白名单的设计原则就是 「执行参数全在服务端」)。现补一条计数查询把这类中断数量带进 stale-check summary 的 resume(u=N),运维据此人工重跑;将来把参数回写落库后即可纳入白名单。 测试:PriceTrackLoopRunServiceTest 新增「已请求停止时中断失败不续派而是停止」, TaskResumeServiceTest 新增「统计不支持续跑的中断任务数」。
This commit is contained in:
+38
@@ -277,6 +277,44 @@ class PriceTrackLoopRunServiceTest {
|
||||
assertEquals(0, loop.getResumeAttempt(), "成功一轮后中断计数归零,避免历史中断占用额度");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已请求停止时中断失败不续派而是停止() throws Exception {
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
PriceTrackLoopRunMapper loopRunMapper = mock(PriceTrackLoopRunMapper.class);
|
||||
FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
|
||||
PriceTrackLoopRunService service = new PriceTrackLoopRunService(
|
||||
loopRunMapper, fileTaskMapper, objectMapper, mock(ZiniaoShopSwitchService.class));
|
||||
|
||||
PriceTrackLoopRunEntity loop = new PriceTrackLoopRunEntity();
|
||||
loop.setId(2699L);
|
||||
loop.setUserId(977L);
|
||||
loop.setStatus("RUNNING");
|
||||
loop.setExecutionMode("INFINITE");
|
||||
loop.setCurrentRound(1);
|
||||
loop.setCurrentShopIndex(0);
|
||||
loop.setActiveTaskId(28587L);
|
||||
loop.setResumeAttempt(0);
|
||||
loop.setStopRequested(true);
|
||||
loop.setShopsJson(objectMapper.writeValueAsString(List.of(shop("张美莺"))));
|
||||
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(28587L);
|
||||
task.setUserId(977L);
|
||||
task.setModuleType("PRICE_TRACK");
|
||||
task.setStatus("FAILED");
|
||||
task.setErrorMessage("客户端异常中断: 客户端重启恢复上报");
|
||||
task.setRequestJson(objectMapper.writeValueAsString(Map.of(
|
||||
"loopRunId", 2699, "roundIndex", 1, "shopIndex", 0)));
|
||||
|
||||
when(loopRunMapper.selectList(any())).thenReturn(List.of(loop));
|
||||
when(fileTaskMapper.selectById(28587L)).thenReturn(task);
|
||||
|
||||
service.syncLoopRunAfterChildTerminal(28587L);
|
||||
|
||||
assertEquals("STOPPED", loop.getStatus(), "停止意图优先于自动续跑");
|
||||
assertEquals(0, loop.getResumeAttempt());
|
||||
}
|
||||
|
||||
private PriceTrackMatchShopsVo.PriceTrackShopQueueItem shop(String name) {
|
||||
PriceTrackMatchShopsVo.PriceTrackShopQueueItem item = new PriceTrackMatchShopsVo.PriceTrackShopQueueItem();
|
||||
item.setShopName(name);
|
||||
|
||||
+13
@@ -139,6 +139,19 @@ class TaskResumeServiceTest {
|
||||
assertEquals(0, stats.resumedTaskCount);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 无候选时统计不支持续跑的中断任务数() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
when(mapper.selectList(any())).thenReturn(List.of());
|
||||
when(mapper.selectCount(any())).thenReturn(3L);
|
||||
TaskResumeService service = service(mapper, List.of(spi("SIMILAR_ASIN")), true, 3);
|
||||
|
||||
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
|
||||
|
||||
assertEquals(0, stats.resumedTaskCount);
|
||||
assertEquals(3, stats.unsupportedTaskCount, "不支持续跑的模块也要可见,供运维人工重跑");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 没有归属用户的中断任务跳过() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
|
||||
Reference in New Issue
Block a user