修复双实例 owner-scoped 结果文件 job 被非归属实例误杀
线上现象:货源查询任务 26402/26400(归属 server-121)在归属机正常推进, 却被 server-110 判为「结果生成失败」,错误为「该任务已绑定到另一台服务实例处理」。 两个缺陷叠加: 1. 两台实例共用一个 RocketMQ consumer group,dispatch 消息被轮询投递; worker 对"PENDING + owner 不匹配"的 job 选择本地抢跑,模块层 ensureTaskOwnedByCurrentInstance 直接抛 TaskOwnerMismatchException, 异常落进通用 catch 被当成生成失败,5 次抢跑即耗尽 retryCount 并终态失败。 2. runPendingJobs 双重 claim:claimRunnableJobsForOwner 已把 job 翻成 RUNNING, 随后又走 claimRunning(条件 PENDING/FAILED)必然失败 → job 被静默丢弃, 归属机的定时兜底从未真正生效。 修复: - worker:非归属实例一律跳过 owner-scoped job;抽出 processClaimed 供已持有 claim 的调用方使用;processInternal 单独捕获 TaskOwnerMismatchException, 只 deferRunning 退回 PENDING,不计入重试。 - TaskFileJobLocalDispatcher 新增 dispatchClaimed。 - dispatch 事件带上 owner,coordinator 按归属路由:本机 owner 直接本地派发不发 MQ, 他机 owner 不发不跑交由归属机轮询接手,owner 为空维持原有 MQ 行为。 - 新增 owner 路由回归测试两组,回滚配合"本地抢跑"的旧断言。 同时提交此前工作区内已随 JAR 上线的 backend-java 改动:SimilarAsin 解析载荷 groups 内嵌 items(Python 旧链路兼容)与 chunk 类型不匹配跳过、 PermissionMenuSchemaInitializer 与 V103 两级菜单分组迁移、相关测试。
This commit is contained in:
+60
-1
@@ -5127,10 +5127,47 @@ public class SimilarAsinTaskService {
|
||||
payload.setSourceFiles(sourceFiles == null ? List.of() : sourceFiles);
|
||||
payload.setHeaders(headers == null ? List.of() : headers);
|
||||
payload.setItems(allRows == null ? List.of() : new ArrayList<>(allRows));
|
||||
payload.setGroups(groups == null ? List.of() : groups);
|
||||
// 兼容 Python 旧链路:groups 需内嵌完整行(Python 端 normalize_groups
|
||||
// 直接返回 groups 并按 gp["items"] 取行;仅有 startIndex/endIndex 引用时
|
||||
// items 为空、任务空转)。startIndex/endIndex 保留,Java 内部 expandGroupRefs 继续使用。
|
||||
payload.setGroups(fillGroupItems(groups, allRows));
|
||||
return writeJson(payload, "保存解析结果失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 group.startIndex/endIndex 半开区间从全量行切片,内嵌回 group.items;
|
||||
* 无索引或切片越界时退回按 group.items 原样(兼容旧 payload 反序列化场景)。
|
||||
*/
|
||||
static List<SimilarAsinParsedGroupVo> fillGroupItems(List<SimilarAsinParsedGroupVo> groups, List<SimilarAsinParsedRowVo> allRows) {
|
||||
if (groups == null || groups.isEmpty()) {
|
||||
return groups == null ? List.of() : groups;
|
||||
}
|
||||
if (allRows == null || allRows.isEmpty()) {
|
||||
return groups;
|
||||
}
|
||||
List<SimilarAsinParsedRowVo> rows = new ArrayList<>(allRows);
|
||||
for (SimilarAsinParsedGroupVo group : groups) {
|
||||
if (group == null) {
|
||||
continue;
|
||||
}
|
||||
Integer start = group.getStartIndex();
|
||||
Integer end = group.getEndIndex();
|
||||
if (start != null && end != null) {
|
||||
int from = Math.max(0, Math.min(start, rows.size()));
|
||||
int to = Math.max(from, Math.min(end, rows.size()));
|
||||
if (to > from) {
|
||||
group.setItems(new ArrayList<>(rows.subList(from, to)));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
// 索引缺失/无效:保留已有 items(兼容旧 payload),不覆盖
|
||||
if (group.getItems() == null) {
|
||||
group.setItems(new ArrayList<>());
|
||||
}
|
||||
}
|
||||
return groups;
|
||||
}
|
||||
|
||||
private String buildTaskResultJson(String aiPrompt, String apiKey, Boolean imgSwitch, Boolean categorySwitch, List<SimilarAsinSourceFileDto> sourceFiles, String parsedPayloadPointer) {
|
||||
Map<String, Object> payload = new LinkedHashMap<>();
|
||||
payload.put("aiPrompt", normalize(aiPrompt));
|
||||
@@ -5172,6 +5209,11 @@ public class SimilarAsinTaskService {
|
||||
}
|
||||
|
||||
private SimilarAsinParsedPayloadDto hydrateParsedPayloadRows(SimilarAsinParsedPayloadDto payload) {
|
||||
return hydrateForPythonCompat(payload);
|
||||
}
|
||||
|
||||
/** 解析载荷 hydrate:回填 allItems/items/groups 内嵌 items(Python 旧链路兼容)。 */
|
||||
static SimilarAsinParsedPayloadDto hydrateForPythonCompat(SimilarAsinParsedPayloadDto payload) {
|
||||
if (payload == null) {
|
||||
return new SimilarAsinParsedPayloadDto();
|
||||
}
|
||||
@@ -5182,6 +5224,13 @@ public class SimilarAsinTaskService {
|
||||
if (payload.getItems() == null || payload.getItems().isEmpty()) {
|
||||
payload.setItems(rows);
|
||||
}
|
||||
// Python 旧链路兼容:读取时也回填 groups 内嵌 items(存量任务 payload
|
||||
// 只有引用),否则 Python normalize_groups 拿到空 items 任务空转。
|
||||
if (payload.getGroups() != null && !payload.getGroups().isEmpty()) {
|
||||
List<SimilarAsinParsedRowVo> filledRows = payload.getItems() == null || payload.getItems().isEmpty()
|
||||
? rows : payload.getItems();
|
||||
payload.setGroups(fillGroupItems(payload.getGroups(), filledRows));
|
||||
}
|
||||
return payload;
|
||||
}
|
||||
|
||||
@@ -5205,6 +5254,16 @@ public class SimilarAsinTaskService {
|
||||
// P1-4:识别跨实例 local 指针读不到的场景,把"chunk 在另一实例"的元信息
|
||||
// 通过 task_scope_state.last_error 留痕,便于排查"为何 owner 切换后 chunk 读不到"。
|
||||
boolean crossInstance = msg.contains("only exists on instance=");
|
||||
// 类型不兼容(如历史版本序列化数据含当前类加载器不认识的类型标记):
|
||||
// 该 chunk 永久不可读,跳过而不是把组装/收尾永久拖死,留痕便于排查。
|
||||
boolean typeMismatch = ex instanceof TypeNotPresentException
|
||||
|| msg.contains("not present");
|
||||
if (typeMismatch) {
|
||||
log.warn("[similar-asin] chunk payload type mismatch, skip chunk taskId={} chunk={} err={}",
|
||||
chunk.getTaskId(), chunk.getChunkIndex(), msg);
|
||||
recordChunkReadFailure(chunk, false, msg);
|
||||
return rows;
|
||||
}
|
||||
log.warn("[similar-asin] read chunk payload failed taskId={} chunk={} crossInstance={} err={}",
|
||||
chunk.getTaskId(), chunk.getChunkIndex(), crossInstance, msg);
|
||||
recordChunkReadFailure(chunk, crossInstance, msg);
|
||||
|
||||
Reference in New Issue
Block a user