(dolphinscheduler) branch dev updated: Fix delay execution task will never be dispatched (#15751)

[wenjun]

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

wenjun 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 2e169076dc Fix delay execution task will never be dispatched (#15751)
2e169076dc is described below

commit 2e169076dc565f194c11ee4f55a4ac7f65071c6a
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Fri Mar 22 16:23:55 2024 +0800

    Fix delay execution task will never be dispatched (#15751)
    
    Co-authored-by: Eric Gao <ericgao.apa...@gmail.com>
---
 .../server/master/runner/GlobalTaskDispatchWaitingQueueLooper.java   | 2 +-
 .../runner/operator/BaseTaskExecuteRunnableDispatchOperator.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/GlobalTaskDispatchWaitingQueueLooper.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/GlobalTaskDispatchWaitingQueueLooper.java
index 49234a99d3..eabbdd8e10 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/GlobalTaskDispatchWaitingQueueLooper.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/GlobalTaskDispatchWaitingQueueLooper.java
@@ -69,7 +69,7 @@ public class GlobalTaskDispatchWaitingQueueLooper extends 
BaseDaemonThread imple
             defaultTaskExecuteRunnable = 
globalTaskDispatchWaitingQueue.takeTaskExecuteRunnable();
             try {
                 TaskExecutionStatus status = 
defaultTaskExecuteRunnable.getTaskInstance().getState();
-                if (status != TaskExecutionStatus.SUBMITTED_SUCCESS) {
+                if (status != TaskExecutionStatus.SUBMITTED_SUCCESS && status 
!= TaskExecutionStatus.DELAY_EXECUTION) {
                     log.warn("The TaskInstance {} state is : {}, will not 
dispatch",
                             
defaultTaskExecuteRunnable.getTaskInstance().getName(), status);
                     continue;
diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnableDispatchOperator.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnableDispatchOperator.java
index cb2c7a0e07..8fa2e2926d 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnableDispatchOperator.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnableDispatchOperator.java
@@ -48,9 +48,10 @@ public abstract class 
BaseTaskExecuteRunnableDispatchOperator implements TaskExe
         if (remainTime > 0) {
             taskInstance.setState(TaskExecutionStatus.DELAY_EXECUTION);
             taskInstanceDao.updateById(taskInstance);
-            log.info("Current taskInstance: {} is choose delay execution, 
delay time: {}/s, remainTime: {}/s",
+            log.info("Current taskInstance: {} is choose delay execution, 
delay time: {}/min, remainTime: {}/s",
                     taskInstance.getName(),
-                    taskInstance.getDelayTime(), remainTime);
+                    taskInstance.getDelayTime(),
+                    remainTime);
         }
         
globalTaskDispatchWaitingQueue.submitTaskExecuteRunnable(taskExecuteRunnable);
     }