From f5ccbbb8cc417db30accf76cf34da017b8cc9bac Mon Sep 17 00:00:00 2001 From: tjq Date: Sun, 20 Jun 2021 13:19:53 +0800 Subject: [PATCH] feat: throw exception when can't find retry instance's job --- .../java/tech/powerjob/server/core/DispatchService.java | 6 ------ .../server/core/workflow/WorkflowInstanceManager.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java index 248f00e4..8bb0d863 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/DispatchService.java @@ -97,12 +97,6 @@ public class DispatchService { log.info("[Dispatcher-{}|{}] cancel dispatch due to instance has been dispatched", jobId, instanceId); return; } - // 任务信息已经被删除 - if (jobInfo.getId() == null) { - log.warn("[Dispatcher-{}|{}] cancel dispatch due to job(id={}) has been deleted!", jobId, instanceId, jobId); - instanceManager.processFinishedInstance(instanceId, instanceInfo.getWfInstanceId(), FAILED, "can't find job by id " + jobId); - return; - } Date now = new Date(); String dbInstanceParams = instanceInfo.getInstanceParams() == null ? "" : instanceInfo.getInstanceParams(); diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java index a1e6aedb..390dbd26 100644 --- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java +++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java @@ -420,7 +420,7 @@ public class WorkflowInstanceManager { */ private void runInstance(PEWorkflowDAG.Node node) { - JobInfoDO jobInfo = jobInfoRepository.findById(node.getJobId()).orElseGet(JobInfoDO::new); + JobInfoDO jobInfo = jobInfoRepository.findById(node.getJobId()).orElseThrow(() -> new PowerJobException("can't find job by jobId:" + node.getJobId())); // 洗去时间表达式类型 jobInfo.setTimeExpressionType(TimeExpressionType.WORKFLOW.getV()); dispatchService.dispatch(jobInfo, node.getInstanceId());