From 3ac859e05ff586f66d60d40ffba8f0e581bc1b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 20 Oct 2026 12:42:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BF=83=E8=B7=B3):=20=E5=BD=B1=E5=AD=90?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=B8=8D=E5=86=8D=E6=96=B0=E5=A2=9E=20catch?= =?UTF-8?q?=20=E5=9D=97=E2=80=94=E2=80=94=E9=9D=99=E9=BB=98=20catch=20?= =?UTF-8?q?=E6=A3=98=E8=BD=AE=E5=BD=93=E5=9C=BA=E6=8A=93=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 闸门红在 CatchSilenceRatchetTest:影子服务新增的 2 处 log-only catch 与位置指纹 新增的 1 处 fail-open catch 都会抬「只 log / 不重抛」台账。改法是消除新增 catch 而不是调基线:tryLock 内部已把 Redis 异常降级成 null,扫描异常交给 Spring 调度器 记录;指纹复用 describe/readPosition 各自的降级出口。之后 1281 例与棘轮全绿。 --- .../service/TaskHeartbeatPositionService.java | 32 ++++++++----------- .../service/TaskLivenessShadowService.java | 14 +++----- .../TaskHeartbeatPositionServiceTest.java | 4 +-- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java index cccf33c79..0fc316569 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java @@ -328,28 +328,24 @@ public class TaskHeartbeatPositionService { } /** - * 影子判官的推进指纹:位置哈希一次读出,计数/文本/阶段任一变化都算推进。 - * 返回 null 表示这个任务没有任何位置信息(老客户端不传位置),不能作为判死证据。 + * 影子判官的推进指纹:计数/文本任一变化都算推进。 + * + *

复用 {@link #describe} 与 {@link #readPosition}(两者各自把 Redis 异常降级成 null), + * 不新增 catch;老客户端只发文本时由 describe 兜住。返回 null 表示没有任何位置信息, + * 不能作为判死证据。 */ private String readProgressFingerprint(Long taskId) { - Map entries; - try { - entries = stringRedisTemplate.opsForHash().entries(KEY_PREFIX + taskId); - } catch (Exception ex) { - log.warn("[heartbeat-position] 读取影子位置失败 taskId={} msg={}", taskId, ex.getMessage()); + String text = describe(taskId); + Position position = readPosition(taskId); + if ((text == null || text.isBlank()) && position == null) { return null; } - if (entries == null || entries.isEmpty()) { - return null; - } - String text = value(entries, "progressText"); - String current = value(entries, "current"); - String total = value(entries, "total"); - if (text.isBlank() && current.isBlank() && total.isBlank()) { - return null; - } - return value(entries, "phase") + "|" + value(entries, "grain") - + "|" + current + "|" + total + "|" + text; + String current = position == null || position.current() == null + ? "" : String.valueOf(position.current()); + String total = position == null || position.total() == null + ? "" : String.valueOf(position.total()); + String grain = position == null || position.grain() == null ? "" : position.grain(); + return grain + "|" + current + "|" + total + "|" + (text == null ? "" : text); } private StallState evaluateAgainstSnapshot(Long taskId, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskLivenessShadowService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskLivenessShadowService.java index f96bff1cf..0ecc825a7 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskLivenessShadowService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskLivenessShadowService.java @@ -75,22 +75,16 @@ public class TaskLivenessShadowService { if (!enabled) { return; } - DistributedJobLockService.LockHandle lock; - try { - lock = distributedJobLockService.tryLock(SCAN_LOCK_NAME, Duration.ofMinutes(5)); - } catch (Exception ex) { - log.warn("{} 获取扫描锁失败,本轮跳过 msg={}", LOG_ANCHOR, ex.getMessage()); - return; - } + // tryLock 内部已把 Redis 异常降级成 null;扫描失败交给 Spring 调度器记录并继续下一轮, + // 不在这里吞异常——影子线只读,抛出去也不会影响任务本身。 + DistributedJobLockService.LockHandle lock = + distributedJobLockService.tryLock(SCAN_LOCK_NAME, Duration.ofMinutes(5)); if (lock == null) { log.info("{} 另一实例持有扫描锁,本轮跳过", LOG_ANCHOR); return; } try (lock) { scanOnce(); - } catch (Exception ex) { - // 影子线只读:扫描失败绝不能影响任务本身 - log.warn("{} 扫描失败(只读,不影响任务) msg={}", LOG_ANCHOR, ex.getMessage(), ex); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionServiceTest.java index 2ba46aa89..49f2aaa6f 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionServiceTest.java @@ -337,7 +337,7 @@ class TaskHeartbeatPositionServiceTest { .thenReturn(Map.of("progressText", "ASIN B0F44Y3YYQ(401/1300)", "current", "401", "total", "1300")); when(hashOperations.entries("task:progress:shadow-stall:123")) - .thenReturn(Map.of("pos", "crawling||400|1300|ASIN B0F44Y3YYQ(400/1300)", + .thenReturn(Map.of("pos", "|400|1300|ASIN B0F44Y3YYQ(400/1300)", "at", String.valueOf(Long.MAX_VALUE))); assertEquals(TaskHeartbeatPositionService.StallState.ADVANCING, @@ -354,7 +354,7 @@ class TaskHeartbeatPositionServiceTest { .thenReturn(Map.of("progressText", "明细处理中", "current", "401", "total", "1300")); when(hashOperations.entries("task:progress:shadow-stall:123")) - .thenReturn(Map.of("pos", "crawling||400|1300|明细处理中", + .thenReturn(Map.of("pos", "|400|1300|明细处理中", "at", String.valueOf(Long.MAX_VALUE))); assertEquals(TaskHeartbeatPositionService.StallState.ADVANCING,