合并分支

This commit is contained in:
super
2026-05-31 09:28:48 +08:00
parent 685e3d2e45
commit 7310abd769
34 changed files with 200 additions and 75 deletions
@@ -121,6 +121,13 @@ public class TaskResultFileJobWorker {
TaskDistributedLockService.LockHandle lockHandle =
taskDistributedLockService.acquire(job.getModuleType(), job.getTaskId(), TaskDistributedLockService.DEFAULT_WAIT_MILLIS);
if (lockHandle == null) {
TaskFileJobEntity latestOnBusy = taskFileJobService.findById(job.getId());
if (latestOnBusy != null && "RUNNING".equals(latestOnBusy.getStatus())) {
taskFileJobService.touchRunning(job.getId());
log.info("[task-file-job] process skipped because task lock is busy and job is already running jobId={} taskId={} moduleType={} resultId={}",
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId());
return;
}
taskFileJobService.requeue(job.getId(), "Task is busy, waiting for previous task operation");
log.info("[task-file-job] process requeued because task lock is busy jobId={} taskId={} moduleType={} resultId={}",
job.getId(), job.getTaskId(), job.getModuleType(), job.getResultId());