fix(长任务判死): 封口前增加「客户端仍在推进」豁免,避免还在采集就被结案丢数据

服务端二次判死线(心跳正常但 N 分钟无结果分片上报)只看分片间隔,客户端攒批回传一慢
就把仍在采集的任务判成卡死、封口结案,后续分片全被拒(生产 28919:1300 行只出 395 行,
丢 905 行)。改为封口前用 TaskHeartbeatPositionService 的位置快照判定客户端是否仍在推进:
ADVANCING(位置在变)→ 本轮不封口;STALLED(长时间不变)→ 按原判据;UNKNOWN(老客户端
无位置信息)→ 保留原行为。接入 similar-asin / appearance-patent / brand / delete-brand /
collect-data 五条判死线。
This commit is contained in:
2026-09-23 10:52:45 +08:00
parent 8d73377b25
commit afa45d51c3
16 changed files with 348 additions and 6 deletions
@@ -72,6 +72,7 @@ import com.nanri.aiimage.modules.task.model.entity.TaskProgressSnapshotEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService;
@@ -199,6 +200,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
private final TaskFileJobService taskFileJobService;
private final TaskDistributedLockService taskDistributedLockService;
private final TaskProgressSnapshotService taskProgressSnapshotService;
private final TaskHeartbeatPositionService taskHeartbeatPositionService;
private final TransientPayloadStorageService transientPayloadStorageService;
private final PlatformTransactionManager transactionManager;
private final DistributedJobLockService distributedJobLockService;
@@ -952,13 +954,23 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
if (lastResultAt == null || lastResultAt.isAfter(cutoff)) {
continue;
}
// 「客户端仍在推进」豁免:位置文本还在变说明采集主线程在干活,只是分片攒着没回传
// (生产 28919:1300 行每 1.5~3 小时才回传一次)。此时封口会把后续分片全部拒掉、数据丢失。
// 位置无变化满 N 分钟(STALLED)才按原判据封口;无位置信息(老客户端)保持原行为。
TaskHeartbeatPositionService.StallState stallState =
taskHeartbeatPositionService.evaluateStall(task.getId(), minutes);
if (stallState == TaskHeartbeatPositionService.StallState.ADVANCING) {
log.info("[similar-asin] 客户端仍在推进,本轮不封口 taskId={} lastResultAt={} position={}",
task.getId(), lastResultAt, taskHeartbeatPositionService.describe(task.getId()));
continue;
}
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(task.getId(), 0L);
if (taskLockHandle == null) {
continue;
}
try (taskLockHandle) {
log.warn("[similar-asin] 心跳正常但 {} 分钟无结果分片上报,按卡死收尾 taskId={} lastResultAt={}",
minutes, task.getId(), lastResultAt);
log.warn("[similar-asin] 心跳正常但 {} 分钟无结果分片上报,按卡死收尾 taskId={} lastResultAt={} stallState={}",
minutes, task.getId(), lastResultAt, stallState);
finalizeStaleTask(task.getId(),
"Python heartbeat alive but no result chunk uploaded for " + minutes + " minutes");
}