Browse Source

fix bug_7537 (#7551)

Co-authored-by: SbloodyS <sbloodys@qq.com>
3.0.0/version-upgrade
SbloodyS 3 years ago committed by GitHub
parent
commit
9f56123a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
  2. 2
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

8
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java

@ -187,12 +187,12 @@ public class StateWheelExecuteThread extends Thread {
if (taskInstance == null) { if (taskInstance == null) {
continue; continue;
} }
if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {
if (!taskInstance.getState().typeIsFinished() && (taskInstance.isSubProcess() || taskInstance.isDependTask())) {
addTaskStateChangeEvent(taskInstance); addTaskStateChangeEvent(taskInstance);
taskInstanceRetryCheckList.remove(taskInstance.getId()); } else if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {
}
if (taskInstance.isSubProcess() || taskInstance.isDependTask()) {
addTaskStateChangeEvent(taskInstance); addTaskStateChangeEvent(taskInstance);
taskInstanceRetryCheckList.remove(taskInstance.getId());
} }
} }
} }

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java

@ -437,6 +437,8 @@ public class WorkflowExecuteThread {
stateWheelExecuteThread.addTask4RetryCheck(task); stateWheelExecuteThread.addTask4RetryCheck(task);
} else { } else {
submitStandByTask(); submitStandByTask();
stateWheelExecuteThread.removeTask4TimeoutCheck(task);
stateWheelExecuteThread.removeTask4RetryCheck(task);
} }
return; return;
} }

Loading…
Cancel
Save