fix(判死线): 「从未上报结果分片」不再静默跳过,按处理位置三分扩到 5 个模块
品牌任务 2626 挂 9 小时那条出口(无结果回传的候选一律 continue、零日志)此前只在 deletebrand 一处改了三分管法;本笔把同一判据接到外观专利、采集、上架、店铺采集、 货源五个模块,并把"待组装→任务锁→尽力收尾→CAS 翻转"的共同尾部抽成一条, 上报过与从未上报两条路共用,避免各模块再各写一份漏掉日志的版本。 合批代价(必须记着):这 28 支文件是并行会话的在制品,提交时它仍在按模块跑变异自证 (ShopDataCrawl 那一支此刻正处于被注入态,注入发生在它自己的副本树里,主树是 pristine), "全量绿"由本次发版前的独立 worktree 构建代为证明,不是它自己报过的数。 新增 3 支 *NoUploadStaleTest;推送前按登记表 50 个值与高熵串扫过 920 行新增,0 命中。
This commit is contained in:
+35
-6
@@ -634,7 +634,27 @@ public class CollectDataService {
|
||||
}
|
||||
for (FileTaskEntity task : candidates) {
|
||||
LocalDateTime lastResultAt = lastResultAtByTaskId.get(task.getId());
|
||||
if (lastResultAt == null || lastResultAt.isAfter(cutoff)) {
|
||||
if (lastResultAt == null) {
|
||||
// 从未上报任何结果分片:原先与「上报仍新鲜」合并成静默 continue,是 2626 那型出口。
|
||||
// 现按「处理位置是否仍在推进」三分:在推进=首批较慢,跳过;位置久未变=判死并写清卡在哪;
|
||||
// 无位置信息(老客户端 / 条目被 prune)=证据不足,保守跳过但留 WARN。
|
||||
String neverReportedPosition = taskHeartbeatPositionService.describe(task.getId());
|
||||
if (taskHeartbeatPositionService.isClientAdvancing(task.getId(), minutes)) {
|
||||
log.info("[collect-data] never-reported skip because client still advancing taskId={} position={} minutes={}",
|
||||
task.getId(), neverReportedPosition, minutes);
|
||||
continue;
|
||||
}
|
||||
if (neverReportedPosition == null || neverReportedPosition.isBlank()) {
|
||||
log.warn("[collect-data] never-reported skip without position evidence taskId={} createdAt={} minutes={}",
|
||||
task.getId(), task.getCreatedAt(), minutes);
|
||||
continue;
|
||||
}
|
||||
log.warn("[collect-data] never-reported but position stuck, failing taskId={} position={} minutes={}",
|
||||
task.getId(), neverReportedPosition, minutes);
|
||||
finalizeNoUploadStaleTask(task.getId(), null, neverReportedPosition, minutes);
|
||||
continue;
|
||||
}
|
||||
if (lastResultAt.isAfter(cutoff)) {
|
||||
continue;
|
||||
}
|
||||
// 「客户端仍在推进」豁免:心跳位置文本还在变,说明采集主线程在干活,只是分片攒着没回传。
|
||||
@@ -645,12 +665,12 @@ public class CollectDataService {
|
||||
task.getId(), lastResultAt, taskHeartbeatPositionService.describe(task.getId()));
|
||||
continue;
|
||||
}
|
||||
finalizeNoUploadStaleTask(task.getId(), lastResultAt, minutes);
|
||||
finalizeNoUploadStaleTask(task.getId(), lastResultAt, null, minutes);
|
||||
}
|
||||
}
|
||||
|
||||
/** 单个任务的二次判死收尾:锁内复查心跳后,有分片→组装部分工作簿;无分片→标失败。 */
|
||||
private void finalizeNoUploadStaleTask(Long taskId, LocalDateTime lastResultAt, long minutes) {
|
||||
private void finalizeNoUploadStaleTask(Long taskId, LocalDateTime lastResultAt, String position, long minutes) {
|
||||
try (TaskDistributedLockService.LockHandle lock =
|
||||
taskDistributedLockService.acquire(MODULE_TYPE, taskId, 0L)) {
|
||||
if (lock == null) {
|
||||
@@ -677,9 +697,7 @@ public class CollectDataService {
|
||||
taskId, lastResultAt, minutes, stats.finalRowCount);
|
||||
return;
|
||||
}
|
||||
markTaskFailed(task, result,
|
||||
"连续 " + minutes + " 分钟无结果回传,疑似客户端任务卡死,任务已自动失败(最后结果上报 " + lastResultAt + ")",
|
||||
stats);
|
||||
markTaskFailed(task, result, noUploadFailReason(minutes, lastResultAt, position), stats);
|
||||
log.warn("[collect-data] no-upload stale task failed without chunks taskId={} lastResultAt={} timeoutMinutes={}",
|
||||
taskId, lastResultAt, minutes);
|
||||
} catch (Exception ex) {
|
||||
@@ -688,6 +706,17 @@ public class CollectDataService {
|
||||
}
|
||||
}
|
||||
|
||||
/** 二次判死原因文案;从未上报与已有上报分开写(后者不能只说「最后结果上报 null」)。 */
|
||||
private String noUploadFailReason(long minutes, LocalDateTime lastResultAt, String position) {
|
||||
if (lastResultAt == null) {
|
||||
String where = position == null || position.isBlank()
|
||||
? "" : ",处理位置长时间停在「" + position + "」未推进";
|
||||
return "任务创建至今超过 " + minutes + " 分钟无任何结果回传" + where
|
||||
+ ",疑似客户端任务卡死,任务已自动失败";
|
||||
}
|
||||
return "连续 " + minutes + " 分钟无结果回传,疑似客户端任务卡死,任务已自动失败(最后结果上报 " + lastResultAt + ")";
|
||||
}
|
||||
|
||||
public CollectDataDashboardVo dashboard(Long userId) {
|
||||
CollectDataDashboardVo vo = new CollectDataDashboardVo();
|
||||
vo.setPendingTaskCount(countActiveTasks(userId));
|
||||
|
||||
Reference in New Issue
Block a user