回传洪水收口(货源+外观): 「任务不是运行中」4 处出口归一进 TaskResultAdmission——真终态(SUCCESS/FAILED)带 40901,异常处理器按幂等成功回 success=true,客户端据此删本地副本停止补发;PENDING 不带码保持可重试(建单就写它,判死=丢还能送到的结果)
判据=两条链 setStatus 实测只有 PENDING/RUNNING/SUCCESS/FAILED,故取 FINISHED_ORDERED 不取 TERMINAL(取消态无证据);摘两支重复 helper 与因此空转的 1 处 BusinessCodes import;TaskDistributedLockService 补 [task-lock-held] 持锁时长留痕(>=5s info/>=60s warn),此前只有 WAIT_LLM 量得出时长 验证=后端全量 4291 passed 0 failed(skipped 7, 6.0min);正反各两支新用例钉死;变异 M1 摘码/M2 全状态带码各杀 2 红、还原字节一致;M3 换成 TERMINAL 无人判红=已知盲区(写进类注释);可读性棘轮 9 格绿(PipelineSupport 缩回 1975 行/基线 1978)
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
package com.nanri.aiimage.common.task;
|
||||
|
||||
import com.nanri.aiimage.common.exception.BusinessCodes;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
|
||||
/**
|
||||
* 「任务不在运行中」这一句拒绝的统一出口(2026-10-11 现网取证:结果补发洪水单设备一天 14,906 行)。
|
||||
*
|
||||
* <p>只有真终态才许带 40901:异常处理器对它按幂等成功返回 {@code success=true},客户端见 success=true
|
||||
* 就删本地副本、停止补发。{@code PENDING} 是建单就写的状态,回传撞上它只是「激活比投递慢一步」,
|
||||
* 结果必须留着补发——给它判死等于把还能送到的数据丢掉。
|
||||
*
|
||||
* <p>终态取 {@link TaskStatuses.FileTask#FINISHED_ORDERED}(SUCCESS/FAILED)而不是 {@code TERMINAL}:
|
||||
* 货源与外观两条链的 {@code setStatus} 实测只出现 PENDING/RUNNING/SUCCESS/FAILED,从不写取消态;
|
||||
* 把取消态也算成「结果不可能再落到」目前没有证据支撑。
|
||||
*/
|
||||
public final class TaskResultAdmission {
|
||||
|
||||
private TaskResultAdmission() {
|
||||
}
|
||||
|
||||
/** 任务不在运行中:真终态带 40901 让客户端收口,其余状态(含空值)不带码、保持可重试。 */
|
||||
public static void rejectNotRunning(String status) {
|
||||
// FINISHED_ORDERED 是 List.of(...),contains(null) 直接抛 NPE;这里必须自己挡住,
|
||||
// 否则摘掉本地 equals 判法之后,空状态会从「可重试拒绝」变成 500。
|
||||
if (status != null && TaskStatuses.FileTask.FINISHED_ORDERED.contains(status)) {
|
||||
throw new BusinessException(BusinessCodes.TASK_ALREADY_FINISHED, "任务不是运行中状态");
|
||||
}
|
||||
throw new BusinessException("任务不是运行中状态");
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.task.TaskResultAdmission;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentExcelParser;
|
||||
@@ -489,7 +490,7 @@ public class AppearancePatentTaskService {
|
||||
}
|
||||
ensureTaskOwnedByCurrentInstance(task, "submit result");
|
||||
if (!STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务不是运行中状态");
|
||||
TaskResultAdmission.rejectNotRunning(task.getStatus());
|
||||
}
|
||||
|
||||
int chunkIndex = request.getChunkIndex() == null ? 0 : request.getChunkIndex();
|
||||
@@ -868,7 +869,7 @@ public class AppearancePatentTaskService {
|
||||
throw new BusinessException("任务不存在");
|
||||
}
|
||||
if (!STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务不是运行中状态");
|
||||
TaskResultAdmission.rejectNotRunning(task.getStatus());
|
||||
}
|
||||
|
||||
ensureTaskOwnedByCurrentInstance(task, "submit result");
|
||||
|
||||
+3
-2
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.exception.BusinessCodes;
|
||||
import com.nanri.aiimage.common.task.TaskResultAdmission;
|
||||
import com.nanri.aiimage.common.service.DistributedJobLockService;
|
||||
import com.nanri.aiimage.config.SimilarAsinProperties;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
|
||||
@@ -526,7 +527,7 @@ public class SimilarAsinPipelineSupport {
|
||||
throw new BusinessException(BusinessCodes.TASK_NOT_FOUND, "任务不存在");
|
||||
}
|
||||
if (!STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务不是运行中状态");
|
||||
TaskResultAdmission.rejectNotRunning(task.getStatus());
|
||||
}
|
||||
|
||||
ownershipSupport.ensureTaskOwnedByCurrentInstance(task, "submit result");
|
||||
@@ -567,7 +568,7 @@ public class SimilarAsinPipelineSupport {
|
||||
throw new BusinessException(BusinessCodes.TASK_NOT_FOUND, "任务不存在");
|
||||
}
|
||||
if (!STATUS_RUNNING.equals(task.getStatus())) {
|
||||
throw new BusinessException("任务不是运行中状态");
|
||||
TaskResultAdmission.rejectNotRunning(task.getStatus());
|
||||
}
|
||||
ownershipSupport.ensureTaskOwnedByCurrentInstance(task, "submit result");
|
||||
|
||||
|
||||
+12
@@ -26,6 +26,9 @@ public class TaskDistributedLockService {
|
||||
/** 续期失败后的重试次数:容忍 Redis 抖动/主从切换造成的瞬时失败。 */
|
||||
private static final int RENEW_MAX_ATTEMPTS = 3;
|
||||
private static final long RENEW_RETRY_DELAY_MILLIS = 200L;
|
||||
/** 持锁时长留痕:任务锁被 LLM 批处理占用是 40902 的来源,此前只有 WAIT_LLM 一支量得出时长。 */
|
||||
private static final long HELD_REPORT_MILLIS = 5000L;
|
||||
private static final long HELD_WARN_MILLIS = 60000L;
|
||||
|
||||
private final DistributedJobLockService distributedJobLockService;
|
||||
private final ThreadLocal<Map<String, HeldLock>> localLocks = ThreadLocal.withInitial(LinkedHashMap::new);
|
||||
@@ -147,6 +150,7 @@ public class TaskDistributedLockService {
|
||||
|
||||
private final DistributedJobLockService.LockHandle delegate;
|
||||
private final Duration ttl;
|
||||
private final long acquiredAtMillis;
|
||||
private ScheduledFuture<?> renewalFuture;
|
||||
private int depth = 1;
|
||||
private volatile boolean closed;
|
||||
@@ -154,6 +158,7 @@ public class TaskDistributedLockService {
|
||||
private HeldLock(DistributedJobLockService.LockHandle delegate, Duration ttl) {
|
||||
this.delegate = delegate;
|
||||
this.ttl = ttl;
|
||||
this.acquiredAtMillis = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
private void close() {
|
||||
@@ -191,7 +196,14 @@ public class TaskDistributedLockService {
|
||||
if (heldLocks.isEmpty()) {
|
||||
localLocks.remove();
|
||||
}
|
||||
long heldMillis = System.currentTimeMillis() - heldLock.acquiredAtMillis;
|
||||
heldLock.close();
|
||||
if (heldMillis >= HELD_WARN_MILLIS) {
|
||||
log.warn("[task-lock-held] lockName={} heldMs={} threshold={}ms",
|
||||
lockName, heldMillis, HELD_WARN_MILLIS);
|
||||
} else if (heldMillis >= HELD_REPORT_MILLIS) {
|
||||
log.info("[task-lock-held] lockName={} heldMs={}", lockName, heldMillis);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user