fix(stability): 接手第三路未提交 WIP 并收口——卡死扫描跨实例归属守卫+补检预算闸
归属声明(不是本会话的产出,本会话只补了漏改的桩):这批改动在工作树里躺到 2026-11-03 00:47 未提交,f43ed6f1 的 commit message 已点名"同工作树另一会话的在飞件 (TaskFileJobService 卡死归属守卫、TaskResultFileJobWorker、DeliverySupport 补检闸及其 3 支测试)未卷入本提交"。用户 2026-11-03 拍板"接手收口后开 Phase 2",故原样入库。 WIP 本体(作者=第三路会话): - TaskFileJobService:resetStuckRunningJobsDetailed 增 currentInstanceId 重载+ belongsToAnotherInstance 谓词——B 扫到 A 正在跑的 RUNNING 行不再翻 PENDING 也不再 +1 stuck_requeue_count(33149 爬到 20 判死线即此形状);不带实例 id 的旧入口保持 原行为,后管人工复位按钮不受守卫影响。 - AppearancePatentDeliverySupport:requestRecheckForMissingRows 自己吃 recheckMaxRounds 预算——行级轮次只在行真进批次才累加,"没有可比对图/载荷"的行 永远进不了批次,于是 33179 一个 1 行缺口六小时补了 70+ 轮。 - 配套:TaskFileJobOwnerHandOffTest +4 支(谓词边界/他机 RUNNING 不翻不判死/ 自己的陈旧行照翻/无实例 id 入口原行为),StuckScan 与 FailureNotify 两支桩 改到新 3 参签名。 本会话补的一格:TaskResultFileJobWorkerTest 三支桩没跟着改到 3 参签名, stuckSimilarAsinJobAtRetryLimitFailsOwningTask 等 3 例 PotentialStubbingProblem 真红(11-03 09:0x 实测)——改成 eq(0),eq(0),anyString() 并补 eq 静态导入。 验证:mvn -o test 定向 6 类(Worker/StuckScan/FailureNotify/OwnerHandOff/ ResultFileJobHandler/RequestSuppliedIdentityOutlet)rc=0 全绿。
This commit is contained in:
+62
@@ -17,6 +17,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
@@ -222,4 +223,65 @@ class TaskFileJobOwnerHandOffTest {
|
||||
|
||||
verify(taskFileJobMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
// ==================== 卡死扫描的归属守卫(B74-02,同一「两处各读各的」家族) ====================
|
||||
|
||||
@Test
|
||||
void test_归属谓词只在两侧都非空且不相等时成立() {
|
||||
assertTrue(TaskFileJobService.belongsToAnotherInstance(STALE_OWNER, TASK_OWNER));
|
||||
assertFalse(TaskFileJobService.belongsToAnotherInstance(TASK_OWNER, TASK_OWNER),
|
||||
"自己的行必须照旧被扫——关掉守卫等于把唯一能回收遗骸的通道一起关死");
|
||||
assertFalse(TaskFileJobService.belongsToAnotherInstance(null, TASK_OWNER),
|
||||
"老行/未领取行没有 owner 段,不得被守卫永久排除在外");
|
||||
assertFalse(TaskFileJobService.belongsToAnotherInstance(" ", TASK_OWNER));
|
||||
assertFalse(TaskFileJobService.belongsToAnotherInstance(STALE_OWNER, null),
|
||||
"本机 id 未知(单实例部署、元数据缺失、后管人工复位)时守卫整体不启用");
|
||||
assertFalse(TaskFileJobService.belongsToAnotherInstance(STALE_OWNER, " "));
|
||||
assertTrue(TaskFileJobService.belongsToAnotherInstance(" " + STALE_OWNER + " ", TASK_OWNER),
|
||||
"两侧都要 trim:owner 段带空白是 scope_key 拼接的既有形状");
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_卡死扫描不得翻另一实例正在跑的作业() {
|
||||
TaskFileJobEntity foreignRunning = job(23784L, 33149L, "RUNNING", STALE_OWNER);
|
||||
foreignRunning.setStuckRequeueCount(20);
|
||||
when(taskFileJobMapper.selectList(any())).thenReturn(List.of(foreignRunning));
|
||||
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
service.resetStuckRunningJobsDetailed(5, 10, TASK_OWNER);
|
||||
|
||||
assertEquals(0, result.resetCount());
|
||||
assertTrue(result.exhaustedJobs().isEmpty(),
|
||||
"到 20 的行也不得由非归属机判死:兜底出表只在归属机跑得动,先判死就把还能补传的单钉死了");
|
||||
verify(taskFileJobMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
verify(applicationEventPublisher, never()).publishEvent(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_卡死扫描仍必须翻自己的陈旧作业() {
|
||||
TaskFileJobEntity ownRunning = job(23784L, 33149L, "RUNNING", TASK_OWNER);
|
||||
ownRunning.setStuckRequeueCount(3);
|
||||
when(taskFileJobMapper.selectList(any())).thenReturn(List.of(ownRunning));
|
||||
when(taskFileJobMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
|
||||
when(taskFileJobMapper.selectBatchIds(any())).thenReturn(List.of(ownRunning));
|
||||
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
service.resetStuckRunningJobsDetailed(5, 10, TASK_OWNER);
|
||||
|
||||
assertEquals(1, result.resetCount());
|
||||
verify(applicationEventPublisher).publishEvent(any(TaskFileJobDispatchEvent.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_不带实例id的扫描入口保持原行为_人工复位不受守卫() {
|
||||
TaskFileJobEntity foreignRunning = job(23784L, 33149L, "RUNNING", STALE_OWNER);
|
||||
when(taskFileJobMapper.selectList(any())).thenReturn(List.of(foreignRunning));
|
||||
when(taskFileJobMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
|
||||
when(taskFileJobMapper.selectBatchIds(any())).thenReturn(List.of(foreignRunning));
|
||||
|
||||
TaskFileJobService.StuckJobResetResult result = service.resetStuckRunningJobsDetailed(5, 10);
|
||||
|
||||
assertEquals(1, result.resetCount(),
|
||||
"后管那枚人工复位按钮点的就是「把它排回去」,不得被归属守卫悄悄拒掉");
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -44,6 +44,7 @@ import java.util.List;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
@@ -173,7 +174,7 @@ class TaskResultFileJobWorkerFailureNotifyTest {
|
||||
job.setErrorMessage("文件生成任务运行超时,已达到最大重试次数");
|
||||
TaskFileJobService.StuckJobResetResult resetResult =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(resetResult);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(resetResult);
|
||||
doThrow(new IllegalStateException("owner mismatch"))
|
||||
.when(similar).handleResultFileJobFailure(any(), anyString());
|
||||
|
||||
|
||||
+16
-16
@@ -126,11 +126,11 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
setInt(worker, "batchSize", 30);
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(2, List.of());
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(45, 30)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(45), eq(30), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(45, 30);
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(eq(45), eq(30), anyString());
|
||||
verify(taskFileJobService, never()).markFailureFinalized(any(), anyString());
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(1L, 11L, null);
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -154,7 +154,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(2L, 12L, " ");
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -168,7 +168,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(3L, 13L, "上游 API 限流,重试耗尽");
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -182,7 +182,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(4L, 14L, null);
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -196,11 +196,11 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskResultFileJobWorker worker = buildWorker();
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of());
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(0, 0);
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(eq(0), eq(0), anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -208,11 +208,11 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskResultFileJobWorker worker = buildWorker();
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of());
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(0, 0);
|
||||
verify(taskFileJobService).resetStuckRunningJobsDetailed(eq(0), eq(0), anyString());
|
||||
verify(similar, never()).handleResultFileJobFailure(any(), anyString());
|
||||
verify(taskFileJobService, never()).markFailureFinalized(any(), anyString());
|
||||
}
|
||||
@@ -223,13 +223,13 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(5L, 15L, null);
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0))
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString()))
|
||||
.thenReturn(result, new TaskFileJobService.StuckJobResetResult(0, List.of()));
|
||||
|
||||
worker.resetStuckJobs();
|
||||
worker.resetStuckJobs();
|
||||
|
||||
verify(taskFileJobService, times(2)).resetStuckRunningJobsDetailed(0, 0);
|
||||
verify(taskFileJobService, times(2)).resetStuckRunningJobsDetailed(eq(0), eq(0), anyString());
|
||||
verify(taskFileJobService).markFailureFinalized(5L, "文件生成任务运行超时,已达到最大重试次数");
|
||||
}
|
||||
|
||||
@@ -239,7 +239,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity job = exhaustedJob(6L, 16L, null);
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
org.mockito.Mockito.doThrow(new IllegalStateException("db down"))
|
||||
.when(similar).handleResultFileJobFailure(job, "文件生成任务运行超时,已达到最大重试次数");
|
||||
|
||||
@@ -255,7 +255,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
TaskFileJobEntity second = exhaustedJob(8L, 18L, "超时");
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(first, second));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -298,7 +298,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
job.setModuleType("UNKNOWN_X");
|
||||
TaskFileJobService.StuckJobResetResult result =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(result);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
@@ -528,7 +528,7 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
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);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(result);
|
||||
|
||||
worker.resetStuckJobs();
|
||||
|
||||
|
||||
+4
-3
@@ -35,6 +35,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.inOrder;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
@@ -220,7 +221,7 @@ class TaskResultFileJobWorkerTest {
|
||||
job.setErrorMessage("文件生成任务运行超时,已达到最大重试次数");
|
||||
TaskFileJobService.StuckJobResetResult resetResult =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(resetResult);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(resetResult);
|
||||
stubSimilarAsinRegistry();
|
||||
|
||||
worker.resetStuckJobs();
|
||||
@@ -235,7 +236,7 @@ class TaskResultFileJobWorkerTest {
|
||||
TaskFileJobEntity second = exhaustedSimilarAsinJob(13859L, 20554L);
|
||||
TaskFileJobService.StuckJobResetResult resetResult =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(first, second));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0)).thenReturn(resetResult);
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString())).thenReturn(resetResult);
|
||||
stubSimilarAsinRegistry();
|
||||
doThrow(new IllegalStateException("owner mismatch"))
|
||||
.doNothing()
|
||||
@@ -255,7 +256,7 @@ class TaskResultFileJobWorkerTest {
|
||||
TaskFileJobEntity job = exhaustedSimilarAsinJob(13860L, 20555L);
|
||||
TaskFileJobService.StuckJobResetResult resetResult =
|
||||
new TaskFileJobService.StuckJobResetResult(0, List.of(job));
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(0, 0))
|
||||
when(taskFileJobService.resetStuckRunningJobsDetailed(eq(0), eq(0), anyString()))
|
||||
.thenReturn(resetResult, resetResult);
|
||||
stubSimilarAsinRegistry();
|
||||
doThrow(new IllegalStateException("temporary database failure"))
|
||||
|
||||
Reference in New Issue
Block a user