feat(任务恢复): 外观专利接上「补传恢复」;合并冲突保留兜底对象并可诊断
28459 的两个遗留项: 1) 外观专利缺「补传恢复」入口——分片缺失致组装 job 重试耗尽后,客户端补传缺口 也无法自动重跑,只能人工重置 job。TaskFileJobService 早有 resetTerminalFailedForRecovery,但只被删除品牌模块接了。现按同一口径在分片 提交成功后检查并恢复;best-effort,恢复失败不影响补传本身。 2) 合并 CAS 冲突不可诊断且会删掉唯一的兜底对象——原实现每次冲突都删掉刚写入的 版本化对象,重试耗尽即抛异常、行仍指向旧指针;一旦旧对象也不在,该分片永久 读不到(28459 的 chunk-462/473/484 正是这个形态)。现在冲突时读回行上当前 哈希并写进异常与日志;终局失败保留最后一个对象,作为读路径「同槽位兄弟对象」 兜底的恢复源。外观专利与相似ASIN 同一口径。 测试:新增 17 个用例(补传恢复 8 / 外观专利合并冲突 5 / 相似ASIN 合并冲突 4), RED 均已确认;全量 mvn test 3099 个 0 失败。
This commit is contained in:
+27
-4
@@ -214,6 +214,7 @@ public class SimilarAsinPipelineSupport {
|
||||
return;
|
||||
}
|
||||
int maxAttempts = 3;
|
||||
String conflictDetail = "未发生冲突";
|
||||
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
|
||||
TaskChunkEntity chunk = taskChunkMapper.selectOne(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, taskId)
|
||||
@@ -275,13 +276,35 @@ public class SimilarAsinPipelineSupport {
|
||||
transientPayloadStorageService.deleteReplacedPayloadIfNeeded(oldPayload, storedPayload);
|
||||
return;
|
||||
}
|
||||
transientPayloadStorageService.deletePayloadIfPresent(storedPayload);
|
||||
// CAS 冲突:读回行上的当前哈希,否则只有一句 conflict 无从判断是谁改的
|
||||
String currentHash = currentPayloadHash(chunk.getId());
|
||||
conflictDetail = "期望hash=" + oldPayloadHash + " 当前hash=" + currentHash;
|
||||
if (attempt < maxAttempts) {
|
||||
log.warn("[similar-asin] chunk payload CAS conflict, retry merge taskId={} scopeHash={} chunk={} attempt={}/{}",
|
||||
taskId, scopeHash, chunkIndex, attempt, maxAttempts);
|
||||
log.warn("[similar-asin] chunk payload CAS conflict, retry merge taskId={} scopeHash={} chunk={} attempt={}/{} 期望hash={} 当前hash={}",
|
||||
taskId, scopeHash, chunkIndex, attempt, maxAttempts, oldPayloadHash, currentHash);
|
||||
// 还要重试:这次写的对象会被下次重写,先删掉避免堆积
|
||||
transientPayloadStorageService.deletePayloadIfPresent(storedPayload);
|
||||
} else {
|
||||
// 终局失败:保留这次写入的版本化对象,作为读路径「同槽位兄弟对象」兜底的恢复源。
|
||||
// 与外观专利同一口径——行没指过去不该让该分片永久判死。
|
||||
log.error("[similar-asin] chunk payload 合并冲突重试耗尽,保留兜底对象 taskId={} scopeHash={} chunk={} 期望hash={} 当前hash={} 保留对象={}",
|
||||
taskId, scopeHash, chunkIndex, oldPayloadHash, currentHash, storedPayload);
|
||||
}
|
||||
}
|
||||
throw new IllegalStateException("相似ASIN分片载荷更新失败");
|
||||
throw new IllegalStateException("相似ASIN分片载荷更新失败 " + conflictDetail);
|
||||
}
|
||||
|
||||
/** 读回 chunk 行当前的 payload_hash,用于 CAS 冲突定位(行已不存在/读取失败时返回可读标记)。 */
|
||||
private String currentPayloadHash(Long chunkId) {
|
||||
if (chunkId == null) {
|
||||
return "chunkId 为空";
|
||||
}
|
||||
try {
|
||||
TaskChunkEntity latest = taskChunkMapper.selectById(chunkId);
|
||||
return latest == null ? "行已不存在" : latest.getPayloadHash();
|
||||
} catch (Exception ex) {
|
||||
return "读取失败:" + ex.getMessage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user