This is an automated email from the ASF dual-hosted git repository.

wenjun pushed a commit to branch 2.0.7-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0.7-prepare by this push:
     new d0366082e6 [Fix-12167][MasterServer] The retry task was submitted in 
advance (#12291)
d0366082e6 is described below

commit d0366082e604bb4624d0b90e27ea1b044a8a2b3b
Author: JinYong Li <[email protected]>
AuthorDate: Mon Oct 10 16:15:17 2022 +0800

    [Fix-12167][MasterServer] The retry task was submitted in advance (#12291)
    
    Co-authored-by: JinyLeeChina <[email protected]>
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteThread.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
index ae837dfe86..b90453349f 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -1464,6 +1464,10 @@ public class WorkflowExecuteThread implements Runnable {
                         submitPostNode(Long.toString(task.getTaskCode()));
                         continue;
                     }
+                    if (retryTask != null && 
!retryTask.retryTaskIntervalOverTime()) {
+                        logger.info("task name: {} retry waiting has not 
exceeded the interval time, and skip submission this time, task id:{}", 
task.getName(), task.getId());
+                        continue;
+                    }
                 }
                 //init varPool only this task is the first time running
                 if (task.isFirstRun()) {

Reply via email to