(dolphinscheduler) branch 3.2.2-prepare updated: Fix task instance which status is dispatch will not be failover (#16110)

[wenjun]

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

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


The following commit(s) were added to refs/heads/3.2.2-prepare by this push:
     new 50c434e6c4 Fix task instance which status is dispatch will not be 
failover (#16110)
50c434e6c4 is described below

commit 50c434e6c421e756a98e6375bb355eecd2cde990
Author: Wenjun Ruan <wen...@apache.org>
AuthorDate: Wed Jun 5 13:31:29 2024 +0800

    Fix task instance which status is dispatch will not be failover (#16110)
    
    (cherry picked from commit a59ecf2aa19f4acd8d9981d14abe4d0c0d8e7fec)
---
 .../server/master/runner/WorkflowExecuteRunnable.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
index 72c52922d7..35b692551d 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -1226,12 +1226,12 @@ public class WorkflowExecuteRunnable implements 
IWorkflowExecuteRunnable {
                         || state == TaskExecutionStatus.DISPATCH
                         || state == TaskExecutionStatus.SUBMITTED_SUCCESS
                         || state == TaskExecutionStatus.DELAY_EXECUTION) {
-                    // try to take over task instance
-                    if (state == TaskExecutionStatus.SUBMITTED_SUCCESS || 
state == TaskExecutionStatus.DELAY_EXECUTION
-                            || state == TaskExecutionStatus.DISPATCH) {
+                    if (state == TaskExecutionStatus.SUBMITTED_SUCCESS
+                            || state == TaskExecutionStatus.DELAY_EXECUTION) {
                         // The taskInstance is not in running, directly 
takeover it
                     } else if (tryToTakeOverTaskInstance(existTaskInstance)) {
-                        log.info("Success take over task {}", 
existTaskInstance.getName());
+                        // If the taskInstance has already dispatched to 
worker then will try to take-over it
+                        log.info("Success take over task {} -> status: {}", 
existTaskInstance.getName(), state);
                         continue;
                     } else {
                         // set the task instance state to fault tolerance