fix(task): 终态任务保留失败兜底出部分结果
B28 的终态守卫把父任务已失败的结果作业直接标终态;terminal_callback_at 一打, stuck 扫描就再也捞不到它,fallbackAssembleOnFailure 不再执行,失败任务永远没有结果文件。 改为判死但保留兜底回调,由归属实例收口;已终态任务的补检直接放行,按已有分片出部分结果。
This commit is contained in:
+15
-2
@@ -371,7 +371,7 @@ class AppearancePatentDeliveryGateTest {
|
||||
when(taskFileJobService.resetTerminalFailedForRecovery(TASK_ID, "APPEARANCE_PATENT", 700L))
|
||||
.thenReturn(pendingJob(500L));
|
||||
|
||||
assertTrue(scheduleFallbackRecheck(task("FAILED"), result(700L), facts));
|
||||
assertTrue(scheduleFallbackRecheck(task("RUNNING"), result(700L), facts));
|
||||
verify(taskCacheService).releaseRowInspection(eq(TASK_ID), anyList(), eq(true));
|
||||
verify(taskCacheService).countRecheckRound(TASK_ID);
|
||||
}
|
||||
@@ -382,7 +382,20 @@ class AppearancePatentDeliveryGateTest {
|
||||
AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true));
|
||||
when(taskCacheService.recheckRounds(TASK_ID)).thenReturn(2L);
|
||||
|
||||
assertFalse(scheduleFallbackRecheck(task("RUNNING"), result(700L), facts));
|
||||
verify(taskFileJobService, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
void terminalTaskWithGapShipsPartialInsteadOfRechecking() throws Exception {
|
||||
// B28 起终态任务的结果作业不会再被 claim;再排补检只会被下一轮终态守卫立刻打回 FAILED。
|
||||
// 终态任务直接按已有分片出部分结果,缺口由行账文案标在表里。
|
||||
List<AppearancePatentParsedRowVo> rows = sheetRows(2);
|
||||
AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true));
|
||||
|
||||
assertFalse(scheduleFallbackRecheck(task("FAILED"), result(700L), facts));
|
||||
verify(taskCacheService, never()).recheckRounds(anyLong());
|
||||
verify(taskCacheService, never()).releaseRowInspection(anyLong(), anyList(), eq(true));
|
||||
verify(taskFileJobService, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong());
|
||||
}
|
||||
|
||||
@@ -406,7 +419,7 @@ class AppearancePatentDeliveryGateTest {
|
||||
when(taskFileJobService.resetTerminalFailedForRecovery(TASK_ID, "APPEARANCE_PATENT", 700L))
|
||||
.thenReturn(job(500L));
|
||||
|
||||
assertFalse(scheduleFallbackRecheck(task("FAILED"), result(700L), facts));
|
||||
assertFalse(scheduleFallbackRecheck(task("RUNNING"), result(700L), facts));
|
||||
verify(taskCacheService, never()).countRecheckRound(anyLong());
|
||||
}
|
||||
|
||||
|
||||
+5
@@ -92,6 +92,9 @@ class TaskFileJobTerminalTaskGuardTest {
|
||||
assertTrue(hasParam(wrapper, "FAILED"), "必须把作业拉成 FAILED,下一轮扫描才捞不到");
|
||||
assertTrue(hasParam(wrapper, 5), "retry_count 必须一次拉满到上限");
|
||||
assertFalse(hasParam(wrapper, "RUNNING"), "不得再翻转成 RUNNING");
|
||||
assertTrue(wrapper.getSqlSet().contains("terminal_callback_at"),
|
||||
"terminal_callback_at 必须显式清空:留给兜底扫描出部分结果,失败任务仍可下载");
|
||||
assertTrue(hasParam(wrapper, null), "terminal_callback_at 置空后兜底扫描才捞得到这一行");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -118,6 +121,8 @@ class TaskFileJobTerminalTaskGuardTest {
|
||||
verify(taskFileJobMapper, times(2)).update(isNull(), captor.capture());
|
||||
assertTrue(hasParam(captor.getAllValues().get(0), "FAILED"), "第一笔是终态收尾");
|
||||
assertTrue(hasParam(captor.getAllValues().get(1), "RUNNING"), "第二笔才是正常 claim");
|
||||
assertTrue(captor.getAllValues().get(0).getSqlSet().contains("terminal_callback_at"),
|
||||
"终态作业必须留给兜底扫描,不能提前打终态回调");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+23
-2
@@ -355,7 +355,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
@Test
|
||||
void terminalParentHeartbeatStopsTouchingAndFailsJob() throws Exception {
|
||||
// 父任务在 worker 执行中变终态:心跳不得再 touchRunning(否则 stuck 扫描永远看不到),
|
||||
// 并主动把 job 收口为 FAILED(终态回调由 markFailedPermanent 打标)。
|
||||
// 并主动把 job 收口为 FAILED;终态回调留给兜底扫描出部分结果,失败任务仍可下载。
|
||||
TaskResultFileJobWorker worker = buildWorker();
|
||||
setLong(worker, "heartbeatIntervalMillis", 10L);
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
@@ -373,13 +373,34 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
try {
|
||||
// heartbeat 间隔下限 1000ms,首轮在 1s 后才跑;给足调度余量
|
||||
verify(taskFileJobService, timeout(3000))
|
||||
.markFailedPermanent(eq(job), contains("父任务已终态"));
|
||||
.markFailedPermanentAwaitingFallback(eq(job), contains("父任务已终态"));
|
||||
verify(taskFileJobService, after(150).never()).touchRunning(77L);
|
||||
} finally {
|
||||
future.cancel(true);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 终态兜底出表只在归属实例做:非归属实例若抢先 markFailureFinalized,归属机的
|
||||
* fallbackAssembleOnFailure 就永远跑不到,失败任务的结果文件也就永远不生成。
|
||||
*/
|
||||
@Test
|
||||
void exhaustedOwnerScopedJobOfAnotherInstanceIsLeftToItsOwner() throws Exception {
|
||||
TaskResultFileJobWorker worker = buildWorker();
|
||||
when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
TaskFileJobEntity job = exhaustedJob(9L, 19L, "父任务已终态,结果作业不再执行");
|
||||
job.setModuleType("APPEARANCE_PATENT");
|
||||
job.setScopeKey("appearance-patent:19:owner:instance-b");
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
verify(appearance, never()).fallbackAssembleResultFile(any());
|
||||
verify(taskFileJobService, never()).markFailureFinalized(any(), anyString());
|
||||
}
|
||||
|
||||
private static void setLong(TaskResultFileJobWorker worker, String fieldName, long value) throws Exception {
|
||||
Field field = TaskResultFileJobWorker.class.getDeclaredField(fieldName);
|
||||
field.setAccessible(true);
|
||||
|
||||
Reference in New Issue
Block a user