A task instance that normally queries the serial wait state.

apache · Apr 26, 2022 · 167f186 · 167f186
1 parent 84cad13
commit 167f186
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...duler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java b/...duler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
@@ -255,5 +255,5 @@ int updateGlobalParamsById(@Param("globalParams") String globalParams,
 
     boolean updateNextProcessIdById(@Param("thisInstanceId") int thisInstanceId, @Param("runningInstanceId") int runningInstanceId);
 
-    ProcessInstance loadNextProcess4Serial(@Param("processDefinitionCode") Long processDefinitionCode, @Param("state") int state);
+    ProcessInstance loadNextProcess4Serial(@Param("processDefinitionCode") Long processDefinitionCode, @Param("state") int state, @Param("id") int id);
 }
diff --git a/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -823,7 +823,7 @@ private void endProcess() {
     public void checkSerialProcess(ProcessDefinition processDefinition) {
         int nextInstanceId = processInstance.getNextProcessInstanceId();
         if (nextInstanceId == 0) {
-            ProcessInstance nextProcessInstance = this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), ExecutionStatus.SERIAL_WAIT.getCode());
+            ProcessInstance nextProcessInstance = this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), ExecutionStatus.SERIAL_WAIT.getCode(), processInstance.getId());
             if (nextProcessInstance == null) {
                 return;
             }

diff --git a/...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -295,5 +295,5 @@ TaskGroupQueue insertIntoTaskGroupQueue(Integer taskId,
     void sendStartTask2Master(ProcessInstance processInstance, int taskId,
                               org.apache.dolphinscheduler.remote.command.CommandType taskType);
 
-    ProcessInstance loadNextProcess4Serial(long code, int state);
+    ProcessInstance loadNextProcess4Serial(long code, int state, int id);
 }
diff --git a/...service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/...service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -3031,8 +3031,8 @@ public void sendStartTask2Master(ProcessInstance processInstance, int taskId,
     }
 
     @Override
-    public ProcessInstance loadNextProcess4Serial(long code, int state) {
-        return this.processInstanceMapper.loadNextProcess4Serial(code, state);
+    public ProcessInstance loadNextProcess4Serial(long code, int state, int id) {
+        return this.processInstanceMapper.loadNextProcess4Serial(code, state, id);
     }
 
     protected void deleteCommandWithCheck(int commandId) {