You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/12/05 05:52:56 UTC
[dolphinscheduler] branch dev updated: [Fix-7093][dolphincheduler-server] fix dependent node stuck in running (#7116)
This is an automated email from the ASF dual-hosted git repository.
leonbao 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 8d39bf1 [Fix-7093][dolphincheduler-server] fix dependent node stuck in running (#7116)
8d39bf1 is described below
commit 8d39bf14b1b189b43d27acfa2a3ae9ddd4eec5c6
Author: SbloodyS <46...@qq.com>
AuthorDate: Sun Dec 5 13:52:48 2021 +0800
[Fix-7093][dolphincheduler-server] fix dependent node stuck in running (#7116)
* fix bug 7093
* remove redundant else
Co-authored-by: SbloodyS <sb...@qq.com>
---
.../dolphinscheduler/server/master/runner/StateWheelExecuteThread.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
index 69bd3cb..84db5bc 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
+++ b/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()) {
if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) {
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());
- return;
}
}
if (taskInstance.taskCanRetry() && taskInstance.retryTaskIntervalOverTime()) {