perf(全链路): 连接池/事务边界/轮询与 IO 效率收口
Java: - LLM 180s 读超时不再被全局 call-timeout 静默截断成 90s(长思考请求被掐断→重试→付费网关二次计费) - 代理 HttpClient 缓存改有界 LRU(jikip 每次提取新 IP,无界缓存持续泄漏 selector 线程与连接池) - 12 个 service 的 Redis 任务锁移出 @Transactional(自旋最坏 10s 白占 DB 连接,池仅 30),远端对象删/传改 afterCommit - 结果文件 Job 闸门拒绝时不再回退内联执行(改重新入队,避免把背压转嫁给 MQ 消费线程) - imagevideo 每秒扫描加列投影、过期清理加 LIMIT;权限页整表查询改列投影(不再拉回密码哈希) - 哈希改 HexFormat;补 5 处"不能改"的技术依据注释(批量插入会丢回填主键、流式丢模板与图片等) 前端:4 个工具页轮询改轻量端点(带 fallback);PriceTrack 快照节流写盘;候选店铺表分页;页面隐藏时停表 客户端:HTTP 连接池按出口复用(Session 仍每请求新建,保持无跨请求状态);品牌检测 WIPO 逐请求握手; 代理配置按 mtime 缓存;串行任务改专属池;异常降级为标签页重连;紫鸟启动改端口轮询;模板编译缓存; 日志上报连接与落盘收口;Flask 版本 API 改按请求复用连接
This commit is contained in:
+92
-9
@@ -57,6 +57,8 @@ import org.springframework.dao.DuplicateKeyException;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.support.TransactionSynchronization;
|
||||
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
||||
import java.io.File;
|
||||
@@ -554,24 +556,28 @@ public class PublishTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除任务。
|
||||
*
|
||||
* <p>事务边界:远端删除(结果文件对象 + 分片载荷)全部移到事务提交后执行 ——
|
||||
* 单次删除超时 120s、重试 3 次,放在 DB 事务里会让连接被长时间占用
|
||||
* (项目在 TaskScopePayloadStorageService 已写明「不能把网络调用放进 DB 事务」)。
|
||||
*/
|
||||
@Transactional
|
||||
public void deleteTask(Long taskId, Long userId) {
|
||||
FileTaskEntity task = requireTaskForDeletion(taskId, userId);
|
||||
List<FileResultEntity> results = fileResultMapper.selectList(new LambdaQueryWrapper<FileResultEntity>()
|
||||
.eq(FileResultEntity::getTaskId, taskId)
|
||||
.eq(FileResultEntity::getModuleType, MODULE_TYPE));
|
||||
List<String> resultObjectKeys = new ArrayList<>();
|
||||
for (FileResultEntity result : results) {
|
||||
if (result.getResultFileUrl() != null && !result.getResultFileUrl().isBlank()) {
|
||||
try {
|
||||
ossStorageService.deleteObject(result.getResultFileUrl());
|
||||
} catch (Exception ex) {
|
||||
log.warn("[publish] OSS cleanup failed taskId={} resultId={} msg={}",
|
||||
taskId, result.getId(), ex.getMessage());
|
||||
}
|
||||
resultObjectKeys.add(result.getResultFileUrl());
|
||||
}
|
||||
}
|
||||
List<String> chunkPayloads = collectTransientResultChunkPayloads(taskId);
|
||||
taskFileJobService.deleteTaskJobs(taskId, MODULE_TYPE);
|
||||
deleteTransientResultChunks(taskId);
|
||||
deleteTransientResultChunkRows(taskId);
|
||||
publishItemMapper.delete(new LambdaQueryWrapper<PublishItemEntity>()
|
||||
.eq(PublishItemEntity::getTaskId, taskId));
|
||||
publishFileMapper.delete(new LambdaQueryWrapper<PublishFileEntity>()
|
||||
@@ -580,6 +586,9 @@ public class PublishTaskService {
|
||||
.eq(FileResultEntity::getTaskId, taskId)
|
||||
.eq(FileResultEntity::getModuleType, MODULE_TYPE));
|
||||
fileTaskMapper.deleteById(task.getId());
|
||||
// 事务提交后再做远端删除
|
||||
deleteResultObjectsAfterCommit(resultObjectKeys, taskId);
|
||||
deletePayloadsAfterCommit(chunkPayloads, taskId);
|
||||
}
|
||||
|
||||
public void deleteHistory(Long resultId, Long userId) {
|
||||
@@ -599,18 +608,35 @@ public class PublishTaskService {
|
||||
}
|
||||
|
||||
private void deleteTransientResultChunks(Long taskId) {
|
||||
List<String> payloads = collectTransientResultChunkPayloads(taskId);
|
||||
deleteTransientResultChunkRows(taskId);
|
||||
deletePayloadsAfterCommit(payloads, taskId);
|
||||
}
|
||||
|
||||
/** 只读收集分片载荷指针,供事务提交后做远端删除。 */
|
||||
private List<String> collectTransientResultChunkPayloads(Long taskId) {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
return;
|
||||
return List.of();
|
||||
}
|
||||
List<TaskChunkEntity> chunks = taskChunkMapper.selectList(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.select(TaskChunkEntity::getPayloadJson)
|
||||
.eq(TaskChunkEntity::getTaskId, taskId)
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE));
|
||||
List<String> payloads = new ArrayList<>();
|
||||
if (chunks != null) {
|
||||
for (TaskChunkEntity chunk : chunks) {
|
||||
transientPayloadStorageService.deletePayloadIfPresent(chunk.getPayloadJson());
|
||||
if (chunk != null && chunk.getPayloadJson() != null && !chunk.getPayloadJson().isBlank()) {
|
||||
payloads.add(chunk.getPayloadJson());
|
||||
}
|
||||
}
|
||||
}
|
||||
return payloads;
|
||||
}
|
||||
|
||||
private void deleteTransientResultChunkRows(Long taskId) {
|
||||
if (taskId == null || taskId <= 0) {
|
||||
return;
|
||||
}
|
||||
taskChunkMapper.delete(new LambdaQueryWrapper<TaskChunkEntity>()
|
||||
.eq(TaskChunkEntity::getTaskId, taskId)
|
||||
.eq(TaskChunkEntity::getModuleType, MODULE_TYPE));
|
||||
@@ -619,6 +645,63 @@ public class PublishTaskService {
|
||||
.eq(TaskScopeStateEntity::getModuleType, MODULE_TYPE));
|
||||
}
|
||||
|
||||
/** 事务提交后逐条删分片载荷;无事务时立即执行(与 TaskResultItemService 同款兜底)。 */
|
||||
private void deletePayloadsAfterCommit(List<String> payloads, Long taskId) {
|
||||
if (payloads == null || payloads.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
|
||||
@Override
|
||||
public void afterCommit() {
|
||||
deletePayloadsNow(payloads, taskId);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
deletePayloadsNow(payloads, taskId);
|
||||
}
|
||||
|
||||
private void deletePayloadsNow(List<String> payloads, Long taskId) {
|
||||
for (String payload : payloads) {
|
||||
try {
|
||||
transientPayloadStorageService.deletePayloadIfPresent(payload);
|
||||
} catch (Exception ex) {
|
||||
log.warn("[publish] 分片载荷删除失败 taskId={} pointer={} msg={}",
|
||||
taskId, transientPayloadStorageService.extractPointer(payload), safeMessage(ex));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 事务提交后删结果文件对象;无事务时立即执行。 */
|
||||
private void deleteResultObjectsAfterCommit(List<String> objectKeys, Long taskId) {
|
||||
if (objectKeys == null || objectKeys.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
|
||||
@Override
|
||||
public void afterCommit() {
|
||||
deleteResultObjectsNow(objectKeys, taskId);
|
||||
}
|
||||
});
|
||||
return;
|
||||
}
|
||||
deleteResultObjectsNow(objectKeys, taskId);
|
||||
}
|
||||
|
||||
private void deleteResultObjectsNow(List<String> objectKeys, Long taskId) {
|
||||
for (String objectKey : objectKeys) {
|
||||
try {
|
||||
ossStorageService.deleteObject(objectKey);
|
||||
log.info("[publish] 结果文件已删除 taskId={} objectKey={}", taskId, objectKey);
|
||||
} catch (Exception ex) {
|
||||
log.warn("[publish] OSS cleanup failed taskId={} objectKey={} msg={}",
|
||||
taskId, objectKey, ex.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteUncommittedPayloads(List<String> storedPayloads) {
|
||||
if (storedPayloads == null || storedPayloads.isEmpty()) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user