GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sj_1.1.0-beta2): 修复决策节点跳过执行导致后续节点不执行的问题

Browse Source
This commit is contained in:
opensnail 2024-07-03 13:04:39 +08:00
parent 88556aa7c1
commit 90c60430b2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java
View File

@ -263,7 +263,8 @@ public class WorkflowExecutorActor extends AbstractActor {
} }
private boolean arePredecessorsComplete(final WorkflowNodeTaskExecuteDTO taskExecute, Set<Long> predecessors, private boolean arePredecessorsComplete(final WorkflowNodeTaskExecuteDTO taskExecute, Set<Long> predecessors,
Map<Long, List<JobTaskBatch>> jobTaskBatchMap, WorkflowNode waitExecWorkflowNode, Map<Long, WorkflowNode> workflowNodeMap) { Map<Long, List<JobTaskBatch>> jobTaskBatchMap, WorkflowNode waitExecWorkflowNode,
Map<Long, WorkflowNode> workflowNodeMap) {
// 判断所有节点是否都完成 // 判断所有节点是否都完成
for (final Long nodeId : predecessors) { for (final Long nodeId : predecessors) {
@ -290,12 +291,17 @@ public class WorkflowExecutorActor extends AbstractActor {
// 父节点只要有一个是失败的且失败策略是阻塞的则当前节点不处理 // 父节点只要有一个是失败的且失败策略是阻塞的则当前节点不处理
if (jobTaskBatches.stream() if (jobTaskBatches.stream()
.map(JobTaskBatch::getTaskBatchStatus) .anyMatch(jobTaskBatch ->
.anyMatch(i -> i != JobTaskBatchStatusEnum.SUCCESS.getStatus())) { jobTaskBatch.getTaskBatchStatus() != JobTaskBatchStatusEnum.SUCCESS.getStatus()
&& !JobOperationReasonEnum.WORKFLOW_SUCCESSOR_SKIP_EXECUTION.contains(jobTaskBatch.getOperationReason()))
) {
WorkflowNode preWorkflowNode = workflowNodeMap.get(nodeId); WorkflowNode preWorkflowNode = workflowNodeMap.get(nodeId);
// 根据失败策略判断是否继续处理 // 根据失败策略判断是否继续处理
if (Objects.equals(preWorkflowNode.getFailStrategy(), FailStrategyEnum.BLOCK.getCode())) { if (Objects.equals(preWorkflowNode.getFailStrategy(), FailStrategyEnum.BLOCK.getCode())) {
SnailJobLog.LOCAL.warn("此节点执行失败且失败策略配置了【阻塞】中断执行 [{}] 待执行节点:[{}] parentId:[{}]", nodeId,
taskExecute.getParentId(),
waitExecWorkflowNode.getId() );
return Boolean.FALSE; return Boolean.FALSE;
} }
} }