[Fix-10762] [bug] Dependent tasks wait for the workflow to end (#10765)

* issue 8645 (#8811)

Co-authored-by: 北笙 <“[email protected]”>
Co-authored-by: zhanqian <[email protected]>

* [fix-8929][DAO]Description Failed to upload the file because the full name was too long (#9020)

* [fix-8929][DAO]Description Failed to upload the file because the full name was too long

* [DS-#8929][fix]Description Failed to upload the file because the full name was too long

* [DS-#8929][fix]Description Failed to upload the file because the full name was too long

* [DS-#8929][fix]Description Failed to upload the file because the full name was too long

Co-authored-by: houshuai <[email protected]>

* [BUG][ALERT-SERVER]validate script before alert script (#9834)

* validate script before alert script

* fix validate script before alert script

* pick 8811/9020/9834

* fix ut

* fix pick error

* fix 10762

Co-authored-by: zhanqian <[email protected]>
Co-authored-by: 北笙 <“[email protected]”>
Co-authored-by: zhanqian <[email protected]>
Co-authored-by: shuai hou <[email protected]>
Co-authored-by: houshuai <[email protected]>
Co-authored-by: Tq <[email protected]>
Co-authored-by: JinyLeeChina <[email protected]>

Author: 7 people

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java

@@ -64,6 +64,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Matcher;

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java

@@ -115,16 +115,16 @@ private DependResult calculateResultForTasks(DependentItem dependentItem, List<D
                         dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode());
                 return DependResult.WAITING;
             }
-            if (!processInstance.getState().typeIsFinished()) {
-                logger.info("Wait for the dependent workflow to complete, processDefiniteCode:{}, taskCode:{}, processInstanceId:{}, processInstance state:{}",
-                        dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode(), processInstance.getId(), processInstance.getState());
-                return DependResult.WAITING;
-            }
             // need to check workflow for updates, so get all task and check the task state
             if (dependentItem.getDepTaskCode() == Constants.DEPENDENT_ALL_TASK_CODE) {
+                if (!processInstance.getState().typeIsFinished()) {
+                    logger.info("Wait for the dependent workflow to complete, processDefiniteCode:{}, taskCode:{}, processInstanceId:{}, processInstance state:{}",
+                        dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode(), processInstance.getId(), processInstance.getState());
+                    return DependResult.WAITING;
+                }
                 result = dependResultByProcessInstance(processInstance, dateInterval);
             } else {
-                result = getDependTaskResult(dependentItem.getDepTaskCode(), dateInterval);
+                result = getDependTaskResult(processInstance, dependentItem.getDepTaskCode(), dateInterval);
             }
             if (result != DependResult.SUCCESS) {
                 break;
@@ -192,10 +192,15 @@ private DependResult dependResultByProcessInstance(ProcessInstance processInstan
     /**
      * get depend task result
      */
-    private DependResult getDependTaskResult(long taskCode, DateInterval dateInterval) {
+    private DependResult getDependTaskResult(ProcessInstance processInstance, long taskCode, DateInterval dateInterval) {
         TaskInstance taskInstance = processService.findLastTaskInstanceInterval(taskCode, dateInterval);
         DependResult result;
         if (taskInstance == null) {
+            if (!processInstance.getState().typeIsFinished()) {
+                logger.info("Wait for the dependent workflow to complete, taskCode:{}, processInstanceId:{}, processInstance state:{}",
+                    taskCode, processInstance.getId(), processInstance.getState());
+                return DependResult.WAITING;
+            }
             TaskDefinition taskDefinition = processService.findTaskDefinitionByCode(taskCode);
             if (taskDefinition == null) {
                 logger.error("Cannot find the task definition, something error, taskCode: {}", taskCode);