Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-9776] A task instance that normally queries the serial wait state. #9777

Merged
merged 1 commit into from
Apr 26, 2022
Merged

[Fix-9776] A task instance that normally queries the serial wait state. #9777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...duler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
4 changes: 2 additions & 2 deletions ...service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down