[dolphinscheduler] branch dev updated: Optimize event loop (#13193)

[caishunfeng]

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

caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new be81b222d4 Optimize event loop (#13193)
be81b222d4 is described below

commit be81b222d432d6cb8da9b68ea7c8feca618a8127
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Thu Dec 15 14:34:52 2022 +0800

    Optimize event loop (#13193)
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java  | 2 +-
 .../server/master/runner/WorkflowExecuteThreadPool.java                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 827e618ec2..efb4a944c7 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
@@ -285,7 +285,7 @@ public class WorkflowExecuteRunnable implements 
Callable<WorkflowSubmitStatue> {
                     stateEvents);
             return;
         }
-        int loopTimes = stateEvents.size();
+        int loopTimes = stateEvents.size() * 2;
         for (int i = 0; i < loopTimes; i++) {
             final StateEvent stateEvent = this.stateEvents.peek();
             try {
diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java
index fd368d55bb..509028277a 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java
@@ -133,7 +133,7 @@ public class WorkflowExecuteThreadPool extends 
ThreadPoolTaskExecutor {
             public void onSuccess(Object result) {
                 try {
                     
LoggerUtils.setWorkflowInstanceIdMDC(workflowExecuteThread.getProcessInstance().getId());
-                    if (workflowExecuteThread.workFlowFinish()) {
+                    if (workflowExecuteThread.workFlowFinish() && 
workflowExecuteThread.eventSize() == 0) {
                         stateWheelExecuteThread
                                 
.removeProcess4TimeoutCheck(workflowExecuteThread.getProcessInstance().getId());
                         
processInstanceExecCacheManager.removeByProcessInstanceId(processInstanceId);