Browse Source

[Fix][Dag] Timeout alert. (#8049)

3.0.0/version-upgrade
songjianet 3 years ago committed by GitHub
parent
commit
0c353d69e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
  2. 12
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="clearfix list" v-if="enable"> <div class="clearfix list" v-if="false">
<div class="text-box"> <div class="text-box">
<span>{{$t('Waiting Dependent start')}}</span> <span>{{$t('Waiting Dependent start')}}</span>
</div> </div>

12
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -648,6 +648,13 @@
'/docs/latest/user_doc/guide/task/' + tasktype.toLowerCase() + '.html' '/docs/latest/user_doc/guide/task/' + tasktype.toLowerCase() + '.html'
}, },
taskToBackfillItem (task) { taskToBackfillItem (task) {
let strategy = ''
if (this.nodeData.taskType === 'DEPENDENT') {
strategy = task.timeoutNotifyStrategy === 'WARNFAILED' ? 'WARN,FAILED' : task.timeoutNotifyStrategy
} else {
strategy = task.timeoutNotifyStrategy
}
return { return {
code: task.code, code: task.code,
conditionResult: task.taskParams.conditionResult, conditionResult: task.taskParams.conditionResult,
@ -669,7 +676,7 @@
taskInstancePriority: task.taskPriority, taskInstancePriority: task.taskPriority,
timeout: { timeout: {
interval: task.timeout, interval: task.timeout,
strategy: task.timeoutNotifyStrategy, strategy,
enable: task.timeoutFlag === 'OPEN' enable: task.timeoutFlag === 'OPEN'
}, },
type: task.taskType, type: task.taskType,
@ -888,6 +895,7 @@
this.successBranch && (this.conditionResult.successNode[0] = this.successBranch) this.successBranch && (this.conditionResult.successNode[0] = this.successBranch)
this.failedBranch && (this.conditionResult.failedNode[0] = this.failedBranch) this.failedBranch && (this.conditionResult.failedNode[0] = this.failedBranch)
this.$emit('addTaskInfo', { this.$emit('addTaskInfo', {
item: { item: {
code: this.nodeData.id, code: this.nodeData.id,
@ -907,7 +915,7 @@
failRetryTimes: this.maxRetryTimes, failRetryTimes: this.maxRetryTimes,
failRetryInterval: this.retryInterval, failRetryInterval: this.retryInterval,
timeoutFlag: this.timeout.enable ? 'OPEN' : 'CLOSE', 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, timeout: this.timeout.interval || 0,
delayTime: this.delayTime, delayTime: this.delayTime,
environmentCode: this.environmentCode || -1, environmentCode: this.environmentCode || -1,

Loading…
Cancel
Save