fix(tasks): PENDING 排队不再按 2 小时判死,等客户端认领
PENDING 是排队态不是卡死态:单机串行跑大任务时队列等再久也必须保留, 按 updated_at 清杀会把排队任务误判成「长期未被领取」并连锁触发自动克隆重试, 同一份活被放大成多条失败记录(2026-10-28 现网 1514 行任务连续三代)。 判死巡检只留 SCHEDULED(到点未启动)与 RUNNING(心跳残留)两条; 排队任务一律等 TaskClientPullService 认领,页面放弃的解析预览也保留。
This commit is contained in:
+23
-32
@@ -17,12 +17,14 @@ import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
@@ -34,9 +36,10 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 陈旧任务判死契约(2026-09-14 修订):
|
||||
* PENDING 仍按 updated_at 判死;SCHEDULED(店铺匹配定时任务)改以 scheduled_at 为基准 ——
|
||||
* 只按 updated_at 会误杀排期在 2 小时之后的定时任务,而 activate 又被「未到定时执行时间」挡住。
|
||||
* 陈旧任务判死契约(2026-10-29 修订):
|
||||
* <b>PENDING 不再判死</b>——它是"排队等 worker 领取",等多久都保留(产品口径:一直排队就行);
|
||||
* SCHEDULED(店铺匹配定时任务)以 scheduled_at 为基准 —— 只按 updated_at 会误杀排期在
|
||||
* 2 小时之后的定时任务,而 activate 又被「未到定时执行时间」挡住;RUNNING 按心跳判死。
|
||||
*/
|
||||
class StaleTaskRepairServiceTest {
|
||||
|
||||
@@ -58,19 +61,25 @@ class StaleTaskRepairServiceTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void PENDING_判死只命中_PENDING_不再波及_SCHEDULED() {
|
||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task(11L)));
|
||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||
void PENDING_排队超时不判死_判死入口不得回填() {
|
||||
// 2026-10-29 产品口径:PENDING 是排队态,AP worker 串行跑大任务时队列再长也保留,
|
||||
// 由 pull 认领;按更新时间清杀会把排队任务误判成「长期未被领取」,还会连锁触发自动重试。
|
||||
assertNull(Arrays.stream(StaleTaskRepairService.class.getDeclaredMethods())
|
||||
.filter(method -> "repairFileTaskStaleIdle".equals(method.getName()))
|
||||
.findFirst().orElse(null),
|
||||
"PENDING 判死入口不得回填:排队中的任务要一直留着等 worker 领取");
|
||||
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleIdle");
|
||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of());
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleScheduled");
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleRunning");
|
||||
|
||||
Map<String, Object> selectParams = selectParams();
|
||||
assertTrue(selectParams.containsValue("PENDING"));
|
||||
assertFalse(selectParams.containsValue("SCHEDULED"), "PENDING 分支命中 SCHEDULED 是定时任务被误杀的原因");
|
||||
|
||||
Map<String, Object> updateParams = updateParams(1);
|
||||
assertTrue(updateParams.containsValue("FAILED"));
|
||||
assertTrue(containsMessage(updateParams, "任务长期未被领取"));
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(2)).selectList(captor.capture());
|
||||
for (Wrapper<FileTaskEntity> wrapper : captor.getAllValues()) {
|
||||
assertFalse(paramsOf(wrapper).containsValue("PENDING"),
|
||||
"判死巡检不得再扫 PENDING:排队任务既不许按 updated_at 清杀,也不许被别的分支误伤");
|
||||
}
|
||||
verify(fileTaskMapper, never()).update(any(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -100,7 +109,6 @@ class StaleTaskRepairServiceTest {
|
||||
void 没有候选任务时不写库() {
|
||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of());
|
||||
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleIdle");
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleScheduled");
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleRunning");
|
||||
|
||||
@@ -169,23 +177,6 @@ class StaleTaskRepairServiceTest {
|
||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 未被领取判死同样要回写结果行并终结作业() {
|
||||
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task(31176L, "PENDING")));
|
||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||
|
||||
ReflectionTestUtils.invokeMethod(service, "repairFileTaskStaleIdle");
|
||||
|
||||
verify(fileResultMapper).update(isNull(), any());
|
||||
verify(taskFileJobService).failUnfinishedJobs(eq(List.of(31176L)), any());
|
||||
}
|
||||
|
||||
private Map<String, Object> selectParams() {
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).selectList(captor.capture());
|
||||
return paramsOf(captor.getValue());
|
||||
}
|
||||
|
||||
private Map<String, Object> updateParams(int times) {
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(times)).update(isNull(), captor.capture());
|
||||
|
||||
Reference in New Issue
Block a user