refactor(phase-3): 3A 拆薄——归属实例谓词收成 support 件,服务侧只留薄委托
AppearancePatentTaskService 棘轮读数 3381→3349;新落 support/AppearancePatentTaskOwnership 114 行(<800 报警线,不进超长清单,readability 棘轮无需登记例外)。 形状与判据一字未改,只是换了住处:owner 优先读 owner_instance_id 列、回落 resultJson.ownerInstanceId 快照(那条 2026-09-30 内部认领实测的注释原样带过来)、 scopeKey 按 ":owner:" 尾段解析、TaskOwnerMismatchException 四枚入参顺序照旧。 服务侧留六枚 1-3 行薄委托+一处 taskOwnership() 访问器——这是本模块已有的先例 (historyAssembler() / sheetBuilder() 同样是服务内部 new 的普通对象,不是 Spring bean), 所以本笔不动构造器、不动装配、注进 wiring slice 的东西一个字节没变。 为什么现在搬:A 聚类(陈旧任务扫描与二次判死)紧接着要抽出去,它跨实例接管那格要用 同一套谓词。谓词留在服务里只有两条路——扫描件回调服务,或者再抄一遍三枚。后者正是 TaskLifecycleDebtRatchetTest 钉住的债(同一条安全谓词手抄 130 遍、只许降), 所以收成一枚可复用件,而不是多一处抄本。 ⚠ 一处可观测差异如实登记:两条 WARN 的 logger 名从 ...AppearancePatentTaskService 变成 ...service.support.AppearancePatentTaskOwnership;消息文本、级别、参数顺序一字未动。 按 logger 名做检索的人要跟着换,别读成「日志丢了」。 门禁:定向批 349 例/0 红/0 错/5 skipped(golden 生成器),BUILD SUCCESS;八条 golden 逐字节相等;CatchSilence 四格未动(搬移不改树上 catch 总数);ArchitectureBoundary 绿。
This commit is contained in:
+20
-52
@@ -36,6 +36,7 @@ import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskD
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.vo.AppearancePatentTaskItemVo;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentRowOutcome;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentSheetBuilder;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentTaskOwnership;
|
||||
import com.nanri.aiimage.modules.file.service.LocalFileStorageService;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
@@ -673,8 +674,9 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
if (!isHeartbeatStale(task, thresholdMillis)) {
|
||||
continue;
|
||||
}
|
||||
String owner = ownerFromTask(task);
|
||||
if (!isOwnerCurrent(owner)) {
|
||||
AppearancePatentTaskOwnership ownership = taskOwnership();
|
||||
String owner = ownership.ownerFromTask(task);
|
||||
if (!ownership.isOwnerCurrent(owner)) {
|
||||
log.warn("[appearance-patent] 心跳超时任务归其他实例所有,由本实例(job 锁持有者)接管判死/恢复 taskId={} owner={} current={}",
|
||||
task.getId(), owner, currentInstanceId());
|
||||
}
|
||||
@@ -2102,73 +2104,39 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
|
||||
.set(FileTaskEntity::getUpdatedAt, LocalDateTime.now()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 归属谓词收在 {@link AppearancePatentTaskOwnership}(3A 拆薄第二笔,逐字搬移)。
|
||||
* 这里保持一层薄委托而不是让调用点直接 new:本支有七处读 owner,抄七遍正是
|
||||
* {@code TaskLifecycleDebtRatchetTest} 钉住的那笔债。
|
||||
*/
|
||||
private AppearancePatentTaskOwnership taskOwnership() {
|
||||
return new AppearancePatentTaskOwnership(instanceMetadata, objectMapper);
|
||||
}
|
||||
|
||||
private String buildTaskOwnerScopeKey(FileTaskEntity task) {
|
||||
Long taskId = task == null ? null : task.getId();
|
||||
return "task:" + taskId + ":owner:" + firstNonBlank(ownerFromTask(task), currentInstanceId());
|
||||
return taskOwnership().buildTaskOwnerScopeKey(task);
|
||||
}
|
||||
|
||||
private String currentInstanceId() {
|
||||
String instanceId = instanceMetadata == null ? null : instanceMetadata.getInstanceId();
|
||||
return firstNonBlank(instanceId, "unknown-instance");
|
||||
return taskOwnership().currentInstanceId();
|
||||
}
|
||||
|
||||
private boolean isJobOwnedByCurrentInstance(TaskFileJobEntity job) {
|
||||
return job == null || isOwnerCurrent(ownerFromScopeKey(job.getScopeKey()));
|
||||
AppearancePatentTaskOwnership ownership = taskOwnership();
|
||||
return job == null || ownership.isOwnerCurrent(ownership.ownerFromScopeKey(job.getScopeKey()));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void ensureTaskOwnedByCurrentInstance(FileTaskEntity task, String operation) {
|
||||
String owner = ownerFromTask(task);
|
||||
if (isOwnerCurrent(owner)) {
|
||||
return;
|
||||
}
|
||||
log.warn("[appearance-patent] reject task operation because owner is another instance taskId={} operation={} owner={} current={}",
|
||||
task == null ? null : task.getId(), operation, owner, currentInstanceId());
|
||||
throw new TaskOwnerMismatchException(
|
||||
task == null ? null : task.getId(),
|
||||
operation,
|
||||
owner,
|
||||
currentInstanceId());
|
||||
}
|
||||
|
||||
private boolean isOwnerCurrent(String owner) {
|
||||
return owner == null || owner.isBlank() || Objects.equals(owner, currentInstanceId());
|
||||
taskOwnership().rejectIfOwnedByAnotherInstance(task, operation);
|
||||
}
|
||||
|
||||
private String ownerFromTask(FileTaskEntity task) {
|
||||
if (task == null) {
|
||||
return null;
|
||||
}
|
||||
// 优先读 owner_instance_id 列:兜底拉取认领(TaskClientPullService.claim)会转交该列,
|
||||
// 而 resultJson 里的 ownerInstanceId 只是 parse 时的快照,转交后不同步 ——
|
||||
// 只读快照会把已在别处认领的任务误拒并标失败(2026-09-30 内部认领上线实测)。
|
||||
if (task.getOwnerInstanceId() != null && !task.getOwnerInstanceId().isBlank()) {
|
||||
return task.getOwnerInstanceId();
|
||||
}
|
||||
if (task.getResultJson() == null || task.getResultJson().isBlank()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
String owner = objectMapper.readTree(task.getResultJson()).path("ownerInstanceId").asText("");
|
||||
return owner.isBlank() ? null : owner;
|
||||
} catch (Exception ex) {
|
||||
log.warn("[appearance-patent] read task owner failed taskId={} err={}",
|
||||
task.getId(), ex.getMessage());
|
||||
return null;
|
||||
}
|
||||
return taskOwnership().ownerFromTask(task);
|
||||
}
|
||||
|
||||
private String ownerFromScopeKey(String scopeKey) {
|
||||
if (scopeKey == null || scopeKey.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
String marker = ":owner:";
|
||||
int index = scopeKey.lastIndexOf(marker);
|
||||
if (index < 0) {
|
||||
return null;
|
||||
}
|
||||
String owner = scopeKey.substring(index + marker.length()).trim();
|
||||
return owner.isBlank() ? null : owner;
|
||||
return taskOwnership().ownerFromScopeKey(scopeKey);
|
||||
}
|
||||
|
||||
private void saveFileBuildProgress(FileTaskEntity task,
|
||||
|
||||
+113
@@ -0,0 +1,113 @@
|
||||
package com.nanri.aiimage.modules.appearancepatent.service.support;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.TaskOwnerMismatchException;
|
||||
import com.nanri.aiimage.config.InstanceMetadata;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 外观专利的「这一单归哪个实例」判定,从 {@code AppearancePatentTaskService} <b>原样搬移</b>
|
||||
* (3A 拆薄第二笔):owner 优先读 {@code owner_instance_id} 列、回落 {@code resultJson.ownerInstanceId}
|
||||
* 快照,{@code scopeKey} 按 {@code ":owner:"} 尾段解析,谓词与文案一字未改。
|
||||
*
|
||||
* <p><b>为什么现在搬得动、以前搬不动。</b>这套谓词一直只有服务侧在用;A 聚类(陈旧任务扫描与
|
||||
* 二次判死)搬出去之后也要用同一套(跨实例接管那格 WARN),留在服务里就只有两条路——让扫描件
|
||||
* 回调服务,或者把三枚谓词再抄一遍。后者正是
|
||||
* {@code TaskLifecycleDebtRatchetTest} 钉住的东西(「同一条安全谓词被手抄的遍数」,实测 130 遍
|
||||
* 只许降),所以这里选择把谓词收成一枚可复用的本地件,而不是多一处抄本。
|
||||
*
|
||||
* <p>⚠ <b>一处可观测差异,如实登记</b>:两条 WARN 的 <b>logger 名</b>从
|
||||
* {@code ...appearancepatent.service.AppearancePatentTaskService} 变成本类
|
||||
* ({@code ...service.support.AppearancePatentTaskOwnership})。消息文本、参数顺序、级别
|
||||
* 一个字没动;按 logger 名做的日志检索要跟着换,别把它读成「日志丢了」。
|
||||
*/
|
||||
@Slf4j
|
||||
public class AppearancePatentTaskOwnership {
|
||||
|
||||
private static final String OWNER_MARKER = ":owner:";
|
||||
|
||||
private final InstanceMetadata instanceMetadata;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
public AppearancePatentTaskOwnership(InstanceMetadata instanceMetadata, ObjectMapper objectMapper) {
|
||||
this.instanceMetadata = instanceMetadata;
|
||||
this.objectMapper = objectMapper;
|
||||
}
|
||||
|
||||
/** 归属实例域那枚 scopeKey:本支挂组装 job 与巡检恢复都用它。 */
|
||||
public String buildTaskOwnerScopeKey(FileTaskEntity task) {
|
||||
Long taskId = task == null ? null : task.getId();
|
||||
return "task:" + taskId + ":owner:" + firstNonBlank(ownerFromTask(task), currentInstanceId());
|
||||
}
|
||||
|
||||
public String currentInstanceId() {
|
||||
String instanceId = instanceMetadata == null ? null : instanceMetadata.getInstanceId();
|
||||
return firstNonBlank(instanceId, "unknown-instance");
|
||||
}
|
||||
|
||||
/**
|
||||
* 归属不符即拒。服务侧那枚 {@code protected} 覆写现在只是转发到这里——
|
||||
* {@link TaskOwnerMismatchException} 的四个入参顺序照旧(taskId/operation/owner/current)。
|
||||
*/
|
||||
public void rejectIfOwnedByAnotherInstance(FileTaskEntity task, String operation) {
|
||||
String owner = ownerFromTask(task);
|
||||
if (isOwnerCurrent(owner)) {
|
||||
return;
|
||||
}
|
||||
log.warn("[appearance-patent] reject task operation because owner is another instance taskId={} operation={} owner={} current={}",
|
||||
task == null ? null : task.getId(), operation, owner, currentInstanceId());
|
||||
throw new TaskOwnerMismatchException(
|
||||
task == null ? null : task.getId(),
|
||||
operation,
|
||||
owner,
|
||||
currentInstanceId());
|
||||
}
|
||||
|
||||
public boolean isOwnerCurrent(String owner) {
|
||||
return owner == null || owner.isBlank() || Objects.equals(owner, currentInstanceId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 优先读 {@code owner_instance_id} 列:兜底拉取认领({@code TaskClientPullService.claim})会转交该列,
|
||||
* 而 {@code resultJson} 里的 {@code ownerInstanceId} 只是 parse 时的快照,转交后不同步 ——
|
||||
* 只读快照会把已在别处认领的任务误拒并标失败(2026-09-30 内部认领上线实测)。
|
||||
*/
|
||||
public String ownerFromTask(FileTaskEntity task) {
|
||||
if (task == null) {
|
||||
return null;
|
||||
}
|
||||
if (task.getOwnerInstanceId() != null && !task.getOwnerInstanceId().isBlank()) {
|
||||
return task.getOwnerInstanceId();
|
||||
}
|
||||
if (task.getResultJson() == null || task.getResultJson().isBlank()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
String owner = objectMapper.readTree(task.getResultJson()).path("ownerInstanceId").asText("");
|
||||
return owner.isBlank() ? null : owner;
|
||||
} catch (Exception ex) {
|
||||
log.warn("[appearance-patent] read task owner failed taskId={} err={}",
|
||||
task.getId(), ex.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public String ownerFromScopeKey(String scopeKey) {
|
||||
if (scopeKey == null || scopeKey.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
int index = scopeKey.lastIndexOf(OWNER_MARKER);
|
||||
if (index < 0) {
|
||||
return null;
|
||||
}
|
||||
String owner = scopeKey.substring(index + OWNER_MARKER.length()).trim();
|
||||
return owner.isBlank() ? null : owner;
|
||||
}
|
||||
|
||||
private static String firstNonBlank(String preferred, String fallback) {
|
||||
return preferred == null || preferred.isBlank() ? fallback : preferred.trim();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user