Browse Source

[Fix-7093][dolphincheduler-server] fix dependent node stuck in running (#7116)

* fix bug 7093

* remove redundant else

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

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

@ -92,9 +92,8 @@ public class StateWheelExecuteThread extends Thread {
for (TaskInstance taskInstance : this.taskInstanceCheckList.values()) { for (TaskInstance taskInstance : this.taskInstanceCheckList.values()) {
if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) { if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) {
long timeRemain = DateUtils.getRemainTime(taskInstance.getStartTime(), taskInstance.getTaskDefine().getTimeout() * Constants.SEC_2_MINUTES_TIME_UNIT); long timeRemain = DateUtils.getRemainTime(taskInstance.getStartTime(), taskInstance.getTaskDefine().getTimeout() * Constants.SEC_2_MINUTES_TIME_UNIT);
if (0 <= timeRemain && processTimeout(taskInstance)) { if (0 >= timeRemain && processTimeout(taskInstance)) {
taskInstanceCheckList.remove(taskInstance.getId()); taskInstanceCheckList.remove(taskInstance.getId());
return;
} }
} }
if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) { if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {

Loading…
Cancel
Save