From 7271eb8ee2ed1c0c65af083908a2ffcd463c3d4d Mon Sep 17 00:00:00 2001 From: srzou Date: Tue, 8 Oct 2024 10:38:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:(1.2.0-beta2):=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DMapReduce=E6=A8=A1=E5=BC=8FReduce=E3=80=81MergeReduce?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=BC=82=E5=B8=B8=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E4=B8=8A=E4=B8=8B=E6=96=87=202=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=8A=82=E7=82=B9?= =?UTF-8?q?stop=E7=9B=B8=E5=85=B3=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/result/job/MapReduceJobExecutorHandler.java | 8 ++++++++ .../server/web/service/impl/WorkflowNodeServiceImpl.java | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java index 30287b700..105b5e26d 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java @@ -123,4 +123,12 @@ public class MapReduceJobExecutorHandler extends AbstractJobExecutorResultHandle return false; } + @Override + protected void openNextWorkflowNode(JobExecutorResultContext context) { + if (context.isCreateReduceTask()){ + // 任务暂未完成，无需开启后续节点；更新上下文 + return; + } + super.openNextWorkflowNode(context); + } } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowNodeServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowNodeServiceImpl.java index e78976c2e..e09ce1a7e 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowNodeServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowNodeServiceImpl.java @@ -52,14 +52,6 @@ public class WorkflowNodeServiceImpl implements WorkflowNodeService { jobHandler.stop(jobTaskBatch.getId()); } - // 继续执行后续的任务 - WorkflowNodeTaskExecuteDTO taskExecuteDTO = new WorkflowNodeTaskExecuteDTO(); - taskExecuteDTO.setWorkflowTaskBatchId(workflowTaskBatchId); - taskExecuteDTO.setTaskExecutorScene(JobTaskExecutorSceneEnum.MANUAL_WORKFLOW.getType()); - taskExecuteDTO.setParentId(nodeId); - - workflowBatchHandler.openNextNode(taskExecuteDTO); - return Boolean.TRUE; }