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:
+52
-21
@@ -37,6 +37,8 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.TransactionDefinition;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
||||
import java.io.File;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -81,6 +83,10 @@ public class PatrolDeleteTaskService {
|
||||
private final TaskScopePayloadStorageService taskScopePayloadStorageService;
|
||||
private final TaskDistributedLockService taskDistributedLockService;
|
||||
private final TaskProgressLightAssembler taskProgressLightAssembler;
|
||||
/**
|
||||
* 事务边界收口用:Redis 任务锁必须在事务外获取,否则自旋等待期间会白占一个 Hikari 连接。
|
||||
*/
|
||||
private final org.springframework.transaction.PlatformTransactionManager transactionManager;
|
||||
|
||||
private FileTaskEntity loadTaskForExecution(Long taskId) {
|
||||
Map<Long, FileTaskEntity> cachedTasks = taskCacheService.getTaskCacheBatch(List.of(taskId));
|
||||
@@ -470,7 +476,10 @@ public class PatrolDeleteTaskService {
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
/**
|
||||
* 事务边界:任务锁在事务外获取(自旋等待不再占用 DB 连接);
|
||||
* 缓存清理放到事务提交后、锁内执行。耗时日志语义保持不变。
|
||||
*/
|
||||
public void deleteTask(Long taskId, Long userId) {
|
||||
long startedAt = System.nanoTime();
|
||||
validateUserId(userId);
|
||||
@@ -480,14 +489,18 @@ public class PatrolDeleteTaskService {
|
||||
}
|
||||
try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
|
||||
long taskLoadedAt = System.nanoTime();
|
||||
fileResultMapper.delete(new LambdaQueryWrapper<FileResultEntity>()
|
||||
.eq(FileResultEntity::getTaskId, taskId)
|
||||
.eq(FileResultEntity::getModuleType, MODULE_TYPE));
|
||||
long resultsDeletedAt = System.nanoTime();
|
||||
cleanupTaskAuxiliaryDataFast(taskId);
|
||||
long auxiliaryDeletedAt = System.nanoTime();
|
||||
fileTaskMapper.deleteById(taskId);
|
||||
long taskDeletedAt = System.nanoTime();
|
||||
long[] marks = new long[3];
|
||||
inNewTransaction(() -> {
|
||||
fileResultMapper.delete(new LambdaQueryWrapper<FileResultEntity>()
|
||||
.eq(FileResultEntity::getTaskId, taskId)
|
||||
.eq(FileResultEntity::getModuleType, MODULE_TYPE));
|
||||
marks[0] = System.nanoTime();
|
||||
cleanupTaskAuxiliaryDataFast(taskId);
|
||||
marks[1] = System.nanoTime();
|
||||
fileTaskMapper.deleteById(taskId);
|
||||
marks[2] = System.nanoTime();
|
||||
return null;
|
||||
});
|
||||
taskCacheService.evictTaskCacheOnly(taskId);
|
||||
long finishedAt = System.nanoTime();
|
||||
log.info("[patrol-delete] delete task timing taskId={} userId={} totalMs={} loadMs={} resultDeleteMs={} auxiliaryDeleteMs={} taskDeleteMs={} cacheMs={}",
|
||||
@@ -495,14 +508,16 @@ public class PatrolDeleteTaskService {
|
||||
userId,
|
||||
elapsedMs(startedAt, finishedAt),
|
||||
elapsedMs(startedAt, taskLoadedAt),
|
||||
elapsedMs(taskLoadedAt, resultsDeletedAt),
|
||||
elapsedMs(resultsDeletedAt, auxiliaryDeletedAt),
|
||||
elapsedMs(auxiliaryDeletedAt, taskDeletedAt),
|
||||
elapsedMs(taskDeletedAt, finishedAt));
|
||||
elapsedMs(taskLoadedAt, marks[0]),
|
||||
elapsedMs(marks[0], marks[1]),
|
||||
elapsedMs(marks[1], marks[2]),
|
||||
elapsedMs(marks[2], finishedAt));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
/**
|
||||
* 事务边界:任务锁在事务外获取,DB 段(复核 + 删除 + 重算)仍在同一事务内。
|
||||
*/
|
||||
public void deleteHistory(Long resultId, Long userId) {
|
||||
validateUserId(userId);
|
||||
FileResultEntity entity = fileResultMapper.selectById(resultId);
|
||||
@@ -516,13 +531,16 @@ public class PatrolDeleteTaskService {
|
||||
return;
|
||||
}
|
||||
try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) {
|
||||
FileResultEntity latestEntity = fileResultMapper.selectById(resultId);
|
||||
if (latestEntity == null || !MODULE_TYPE.equals(latestEntity.getModuleType()) || !userId.equals(latestEntity.getUserId())) {
|
||||
throw new BusinessException("record not found");
|
||||
}
|
||||
fileResultMapper.deleteById(resultId);
|
||||
cleanupResultAuxiliaryDataFast(taskId, resultId);
|
||||
reconcileTaskAfterResultRemoval(taskId);
|
||||
inNewTransaction(() -> {
|
||||
FileResultEntity latestEntity = fileResultMapper.selectById(resultId);
|
||||
if (latestEntity == null || !MODULE_TYPE.equals(latestEntity.getModuleType()) || !userId.equals(latestEntity.getUserId())) {
|
||||
throw new BusinessException("record not found");
|
||||
}
|
||||
fileResultMapper.deleteById(resultId);
|
||||
cleanupResultAuxiliaryDataFast(taskId, resultId);
|
||||
reconcileTaskAfterResultRemoval(taskId);
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1094,6 +1112,19 @@ public class PatrolDeleteTaskService {
|
||||
return taskDistributedLockService.acquire(MODULE_TYPE, taskId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 显式短事务:锁已在事务外获取,这里只包住 DB 段,
|
||||
* 保证原来同属一个 @Transactional 的多条写仍在同一事务内。
|
||||
*/
|
||||
private <T> T inNewTransaction(java.util.function.Supplier<T> action) {
|
||||
if (transactionManager == null) {
|
||||
return action.get();
|
||||
}
|
||||
TransactionTemplate template = new TransactionTemplate(transactionManager);
|
||||
template.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
|
||||
return template.execute(status -> action.get());
|
||||
}
|
||||
|
||||
private void markResultSuccess(FileResultEntity row) {
|
||||
row.setSuccess(RESULT_SUCCESS);
|
||||
row.setErrorMessage(null);
|
||||
|
||||
Reference in New Issue
Block a user