[Bug] [Fix-10672] Dependent task retry bug (#10707)

* fix 10517 * fix dep warn bug Co-authored-by: JinyLeeChina <jiny.li@foxmail.com>
apache · Jul 1, 2022 · 3c20fe7 · 3c20fe7
1 parent 1f7a328
commit 3c20fe7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java b/...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
@@ -348,13 +348,17 @@ private boolean taskTimeout(StateEvent stateEvent) {
             return true;
         }
         TaskTimeoutStrategy taskTimeoutStrategy = taskInstance.getTaskDefine().getTimeoutNotifyStrategy();
-        if (TaskTimeoutStrategy.FAILED == taskTimeoutStrategy && !taskInstance.getState().typeIsFinished()) {
+        if ((TaskTimeoutStrategy.FAILED == taskTimeoutStrategy || TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) && !taskInstance.getState().typeIsFinished()) {
             ITaskProcessor taskProcessor = activeTaskProcessorMaps.get(stateEvent.getTaskInstanceId());
             taskProcessor.action(TaskAction.TIMEOUT);
             if (taskInstance.isDependTask()) {
                 TaskInstance task = processService.findTaskInstanceById(taskInstance.getId());
                 taskFinished(task);
             }
+            if (TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) {
+                ProjectUser projectUser = processService.queryProjectWithUserByProcessInstanceId(processInstance.getId());
+                processAlertManager.sendTaskTimeoutAlert(processInstance, taskInstance, projectUser);
+            }
         } else {
             ProjectUser projectUser = processService.queryProjectWithUserByProcessInstanceId(processInstance.getId());
             processAlertManager.sendTaskTimeoutAlert(processInstance, taskInstance, projectUser);

diff --git a/...duler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java b/...duler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
@@ -196,7 +196,12 @@ private DependResult getDependTaskResult(long taskCode, DateInterval dateInterva
         TaskInstance taskInstance = processService.findLastTaskInstanceInterval(taskCode, dateInterval);
         DependResult result;
         if (taskInstance == null) {
-            logger.warn("Cannot find the task in the process instance when the ProcessInstance is finish, taskCode: {}", taskCode);
+            TaskDefinition taskDefinition = processService.findTaskDefinitionByCode(taskCode);
+            if (taskDefinition == null) {
+                logger.error("Cannot find the task definition, something error, taskCode: {}", taskCode);
+            } else {
+                logger.warn("Cannot find the task in the process instance when the ProcessInstance is finish, taskCode: {}, taskName: {}", taskCode, taskDefinition.getName());
+            }
             result = DependResult.FAILED;
         } else {
             logger.info("The running task, taskId:{}, taskCode:{}, taskName:{}", taskInstance.getId(), taskInstance.getTaskCode(), taskInstance.getName());

diff --git a/...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -2489,6 +2489,13 @@ public TaskDefinition findTaskDefinition(long taskCode, int taskDefinitionVersio
         return taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskDefinitionVersion);
     }
 
+    /**
+     * find task definition by code
+     */
+    public TaskDefinition findTaskDefinitionByCode(long taskCode) {
+        return taskDefinitionMapper.queryByCode(taskCode);
+    }
+
     /**
      * find process task relation list by process
      */