后端(四面9分批次): 锁跳过留痕、状态词表收成单点、版本硬地板进 yml 并记账
- 14 处「拿不到锁就 continue」过去零日志,现统一带可聚合锚点并有留痕判据 (LockSkipWitnessTest 7 例 + LockSkipSilentExitGuardrailTest 4 例)。 - 任务状态词表:散落内联集合改由单一定义点判方向(TaskStatusVocabularyRatchetTest 7 例), CANCELED/CANCELLED 只做归一映射,没改库值也没改对外契约。 - 版本硬地板三键(min-supported / enforce / rejectUnreported)此前在任何 yml 里 0 处=出厂即惰性; 现在入册且 enforce=false 走记账模式(ClientVersionFloorConfigTest 9 例),真挡谁留给用户拍。 - 业务码→HTTP 状态只做映射单点 + 开关(默认关,开启前逐字节等价,BusinessErrorHttpStatusTest 8 例); 直接翻面会让三个前端把业务失败读成网络挂了。 - 验收:mvn -o test 这 5 个类 35 例 0 红(用 python subprocess 起 mvn——bash 里 cmd 包一层 开的是交互式 cmd,rc 是 cmd 的,会给出假的 rc=0)。
This commit is contained in:
+2
-1
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.similarasin.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.api.PageDefaults;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinFilterConditionAddRequest;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParseRequest;
|
||||
@@ -129,7 +130,7 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "历史记录条数,默认 50,最大 100", example = "50")
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
|
||||
@RequestParam(value = "limit", required = false, defaultValue = PageDefaults.DEFAULT_RESULT_LIMIT) Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.history(userId, limit));
|
||||
|
||||
+6
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.util.LockSkipWitness;
|
||||
import com.nanri.aiimage.common.service.DistributedJobLockService;
|
||||
import com.nanri.aiimage.common.util.FailedStatusRowFilter;
|
||||
import com.nanri.aiimage.common.util.StaleTaskDeathReason;
|
||||
@@ -877,6 +878,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(task.getId(), 0L);
|
||||
if (taskLockHandle == null) {
|
||||
// 锁被 owner 实例/文件任务 worker 占用说明其仍活跃,静默跳过等下一轮(2 分钟后再判)
|
||||
LockSkipWitness.recordSkip("similar-asin:heartbeat-stale-scan", MODULE_TYPE, task.getId());
|
||||
continue;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
@@ -892,6 +894,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
}
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(taskId, 0L);
|
||||
if (taskLockHandle == null) {
|
||||
LockSkipWitness.recordAbandoned("similar-asin:debug-finalize-stale", MODULE_TYPE, taskId);
|
||||
return;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
@@ -1023,6 +1026,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
TaskDistributedLockService.LockHandle neverReportedLock =
|
||||
ownershipSupport().acquireTaskLock(task.getId(), 0L);
|
||||
if (neverReportedLock == null) {
|
||||
LockSkipWitness.recordSkip("similar-asin:never-reported-stale-scan", MODULE_TYPE, task.getId());
|
||||
continue;
|
||||
}
|
||||
try (neverReportedLock) {
|
||||
@@ -1049,6 +1053,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
}
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport().acquireTaskLock(task.getId(), 0L);
|
||||
if (taskLockHandle == null) {
|
||||
LockSkipWitness.recordSkip("similar-asin:no-result-shard-stale-scan", MODULE_TYPE, task.getId());
|
||||
continue;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
@@ -1488,6 +1493,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
DistributedJobLockService.LockHandle lockHandle =
|
||||
distributedJobLockService.tryLock("similar-asin:llm-poll", Duration.ofMinutes(1));
|
||||
if (lockHandle == null) {
|
||||
LockSkipWitness.abandoned("similar-asin:llm-poll");
|
||||
return;
|
||||
}
|
||||
try (lockHandle) {
|
||||
|
||||
+5
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.similarasin.service.support;
|
||||
|
||||
import com.nanri.aiimage.common.util.UserMessages;
|
||||
import com.nanri.aiimage.common.util.LockSkipWitness;
|
||||
import cn.hutool.crypto.digest.DigestUtil;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultGroupDto;
|
||||
@@ -984,6 +985,7 @@ public class SimilarAsinPipelineSupport {
|
||||
taskQueueExecutor.execute(() -> {
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
|
||||
if (taskLockHandle == null) {
|
||||
LockSkipWitness.recordAbandoned("similar-asin:direct-llm-poll-fallback", MODULE_TYPE, taskId);
|
||||
return;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
@@ -1014,6 +1016,7 @@ public class SimilarAsinPipelineSupport {
|
||||
}
|
||||
TaskDistributedLockService.LockHandle taskLockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
|
||||
if (taskLockHandle == null) {
|
||||
LockSkipWitness.recordAbandoned("similar-asin:resubmit-pending-llm-states", MODULE_TYPE, taskId);
|
||||
return;
|
||||
}
|
||||
try (taskLockHandle) {
|
||||
@@ -1484,6 +1487,7 @@ public class SimilarAsinPipelineSupport {
|
||||
}
|
||||
TaskDistributedLockService.LockHandle lockHandle = ownershipSupport.acquireTaskLock(taskId, 0L);
|
||||
if (lockHandle == null) {
|
||||
LockSkipWitness.recordAbandoned("similar-asin:maybe-finalize-llm-job", MODULE_TYPE, taskId);
|
||||
return;
|
||||
}
|
||||
try (lockHandle) {
|
||||
@@ -1509,6 +1513,7 @@ public class SimilarAsinPipelineSupport {
|
||||
DistributedJobLockService.LockHandle lockHandle =
|
||||
distributedJobLockService.tryLock("similar-asin:llm-finalize:" + taskId, Duration.ofMinutes(5));
|
||||
if (lockHandle == null) {
|
||||
LockSkipWitness.recordAbandoned("similar-asin:llm-finalize-job-lock", MODULE_TYPE, taskId);
|
||||
return;
|
||||
}
|
||||
try (lockHandle) {
|
||||
|
||||
Reference in New Issue
Block a user