[dolphinscheduler] branch 2.0.3-prepare updated: [Fix][Dag] Timeout alert. (#8047)

[caishunfeng]

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

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


The following commit(s) were added to refs/heads/2.0.3-prepare by this push:
     new bca7353  [Fix][Dag] Timeout alert. (#8047)
bca7353 is described below

commit bca7353fe405829e243e6362b9f9541788b1f748
Author: songjianet <1778651...@qq.com>
AuthorDate: Fri Jan 14 17:41:08 2022 +0800

    [Fix][Dag] Timeout alert. (#8047)
---
 .../pages/dag/_source/formModel/_source/dependentTimeout.vue |  2 +-
 .../js/conf/home/pages/dag/_source/formModel/formModel.vue   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
index d4cd8ef..a87b666 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <div class="clearfix list" v-if="enable">
+    <div class="clearfix list" v-if="false">
       <div class="text-box">
         <span>{{$t('Waiting Dependent start')}}</span>
       </div>
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index c30c130..8e6ac0d 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -547,6 +547,13 @@
     methods: {
       ...mapActions('dag', ['getTaskInstanceList']),
       taskToBackfillItem (task) {
+        let strategy = ''
+        if (this.nodeData.taskType === 'DEPENDENT') {
+          strategy = task.timeoutNotifyStrategy === 'WARNFAILED' ? 
'WARN,FAILED' : task.timeoutNotifyStrategy
+        } else {
+          strategy = task.timeoutNotifyStrategy
+        }
+
         return {
           code: task.code,
           conditionResult: task.taskParams.conditionResult,
@@ -568,7 +575,7 @@
           taskInstancePriority: task.taskPriority,
           timeout: {
             interval: task.timeout,
-            strategy: task.timeoutNotifyStrategy,
+            strategy,
             enable: task.timeoutFlag === 'OPEN'
           },
           type: task.taskType,
@@ -754,6 +761,7 @@
         }
         this.successBranch && (this.conditionResult.successNode[0] = 
this.successBranch)
         this.failedBranch && (this.conditionResult.failedNode[0] = 
this.failedBranch)
+
         this.$emit('addTaskInfo', {
           item: {
             code: this.nodeData.id,
@@ -773,7 +781,7 @@
             failRetryTimes: this.maxRetryTimes,
             failRetryInterval: this.retryInterval,
             timeoutFlag: this.timeout.enable ? 'OPEN' : 'CLOSE',
-            timeoutNotifyStrategy: this.timeout.strategy,
+            timeoutNotifyStrategy: this.timeout.strategy.indexOf(',') > 0 ? 
'WARNFAILED' : this.timeout.strategy,
             timeout: this.timeout.interval || 0,
             delayTime: this.delayTime,
             environmentCode: this.environmentCode || -1,