From 14c4e9b6e5a9525bbcb1b98b001518366e18e1d1 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 29 May 2025 10:32:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BB=E5=A1=9E=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/engine/dispatcher/impl/SerialDispatcher.java | 5 +++-- .../casic/ci/process/engine/runContext/BaseRunContext.java | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java index 82a608b0..5286257d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java @@ -47,10 +47,11 @@ public class SerialDispatcher implements BaseDispatcher { TaskRunMessage taskRunMessage = new TaskRunMessage(pipTask); redisMQTemplate.send(taskRunMessage); // TODO 监听当前taskContext状态变成执行成功或者执行失败(worker当中改变状态为运行中、执行成功、执行失败) - // + AtomicInteger state = taskRunContext.getState(); while (state.get() != ContextStateEnum.HAPPY_ENDING.getCode() - && state.get() != ContextStateEnum.BAD_ENDING.getCode()) { +// && state.get() != ContextStateEnum.BAD_ENDING.getCode() + ) { // Thread.sleep(1000L); taskRunContext.pause(); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java index 28186a38..4b134464 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/BaseRunContext.java @@ -105,12 +105,11 @@ public abstract class BaseRunContext { * */ public void checkChildEnd() throws ServiceException{ Map childContext = getChildContext(); - + if (childContext.size()!=childCount) { + return; + } int result = ContextStateEnum.HAPPY_ENDING.getCode(); for (Map.Entry entry : childContext.entrySet()) { - if (childContext.size()!=childCount) { - return; - } BaseRunContext child = entry.getValue(); int state = child.getState().get(); if (!ContextStateEnum.HAPPY_ENDING.getCode().equals(state)&&!ContextStateEnum.BAD_ENDING.getCode().equals(state)) {