[dolphinscheduler] branch 3.0.0-prepare updated (83281ce9e6 -> 648d469b62)

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a change to branch 3.0.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


 discard 83281ce9e6 Return status
     new 648d469b62 Return status

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (83281ce9e6)
            \
             N -- N -- N   refs/heads/3.0.0-prepare (648d469b62)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[dolphinscheduler] 01/01: Return status

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch 3.0.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git

commit 648d469b62056ff066f9b28caae23cdbfcc52049
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Tue Jul 19 12:24:59 2022 +0800

    Return status
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
index 0e94b0318d..9413707dcd 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -1524,6 +1524,7 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> {
         if (state == ExecutionStatus.READY_BLOCK) {
             ExecutionStatus executionStatus = processReadyBlock();
             logger.info("The workflowInstance is ready to block, the workflowInstance status is {}", executionStatus);
+            return executionStatus;
         }
 
         // waiting thread
@@ -1552,6 +1553,7 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> {
                 executionStatus = ExecutionStatus.SUCCESS;
             }
             logger.info("The workflowInstance is ready to stop, the workflow status is {}", executionStatus);
+            return executionStatus;
         }
 
         // process failure