Merge pull request #3849 from yinancx/dev

[Feature][ui]Waiting dependent nodes start timeout

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

@@ -0,0 +1,218 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+<template>
+  <div class="timeout-alarm-model">
+    <div class="clearfix list">
+      <div class="text-box">
+        <span>{{$t('Timeout alarm')}}</span>
+      </div>
+      <div class="cont-box">
+        <label class="label-box">
+          <div style="padding-top: 5px;">
+            <x-switch v-model="enable" @on-click="_onSwitch(0, $event)" :disabled="isDetails"></x-switch>
+          </div>
+        </label>
+      </div>
+    </div>
+    <div class="clearfix list" v-if="enable">
+      <div class="text-box">
+        <span>{{$t('Waiting Dependent start')}}</span>
+      </div>
+      <div class="cont-box">
+        <label class="label-box">
+          <div style="padding: 5px 0;">
+            <x-switch v-model="waitStartTimeout.enable" @on-click="_onSwitch(1, $event)" :disabled="isDetails"></x-switch>
+          </div>
+        </label>
+      </div>
+    </div>
+    <div class="clearfix list" v-if="enable && waitStartTimeout.enable">
+      <div class="cont-box">
+        <label class="label-box">
+          <span class="text-box">
+            <span>{{$t('Timeout period')}}</span>
+          </span>
+          <x-input v-model="waitStartTimeout.interval" style="width: 100px;" :disabled="isDetails" maxlength="9">
+            <span slot="append">{{$t('Minute')}}</span>
+          </x-input>
+          <span class="text-box">
+            <span>{{$t('Check interval')}}</span>
+          </span>
+          <x-input v-model="waitStartTimeout.checkInterval" style="width: 100px;" :disabled="isDetails" maxlength="9">
+            <span slot="append">{{$t('Minute')}}</span>
+          </x-input>
+          <span class="text-box">
+            <span>{{$t('Timeout strategy')}}</span>
+          </span>
+          <div style="padding-top: 6px;">
+            <x-checkbox-group v-model="waitStartTimeout.strategy">
+              <x-checkbox label="FAILED" :disabled="true">{{$t('Timeout failure')}}</x-checkbox>
+            </x-checkbox-group>
+          </div>
+        </label>
+      </div>
+    </div>
+    <div class="clearfix list" v-if="enable">
+      <div class="text-box">
+        <span>{{$t('Waiting Dependent complete')}}</span>
+      </div>
+      <div class="cont-box">
+        <label class="label-box">
+          <div style="padding: 5px 0;">
+            <x-switch v-model="waitCompleteTimeout.enable" @on-click="_onSwitch(2, $event)" :disabled="isDetails"></x-switch>
+          </div>
+        </label>
+      </div>
+    </div>
+    <div class="clearfix list" v-if="enable && waitCompleteTimeout.enable">
+      <div class="cont-box">
+        <label class="label-box">
+          <span class="text-box">
+            <span>{{$t('Timeout period')}}</span>
+          </span>
+          <x-input v-model="waitCompleteTimeout.interval" style="width: 100px;" :disabled="isDetails" maxlength="9">
+            <span slot="append">{{$t('Minute')}}</span>
+          </x-input>
+          <span class="text-box">
+            <span>{{$t('Timeout strategy')}}</span>
+          </span>
+          <div style="padding-top: 6px;">
+            <x-checkbox-group v-model="waitCompleteTimeout.strategy">
+              <x-checkbox label="WARN" :disabled="isDetails">{{$t('Timeout alarm')}}</x-checkbox>
+              <x-checkbox label="FAILED" :disabled="isDetails">{{$t('Timeout failure')}}</x-checkbox>
+            </x-checkbox-group>
+          </div>
+        </label>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import _ from 'lodash'
+  import disabledState from '@/module/mixin/disabledState'
+
+  export default {
+    name: 'form-dependent-timeout',
+    data () {
+      return {
+        // Timeout display hiding
+        enable: false,
+        waitStartTimeout: {
+          enable: false,
+          // Timeout strategy
+          strategy: ['FAILED'],
+          // Timeout period
+          interval: null,
+          checkInterval: null
+        },
+        waitCompleteTimeout: {
+          enable: false,
+          // Timeout strategy
+          strategy: [],
+          // Timeout period
+          interval: null
+        }
+      }
+    },
+    mixins: [disabledState],
+    props: {
+      backfillItem: Object
+    },
+    methods: {
+      _onSwitch (p, is) {
+        // reset timeout setting when switch timeout on/off.
+        // p = 0 for timeout switch; p = 1 for wait start timeout switch; p = 2 for wait complete timeout switch.
+        if (p === 1 || p === 0) {
+          this.waitStartTimeout.interval = is ? 30 : null
+          this.waitStartTimeout.checkInterval = is ? 1 : null
+        }
+        if (p === 2 || p === 0) {
+          this.waitCompleteTimeout.strategy = is ? ['WARN'] : []
+          this.waitCompleteTimeout.interval = is ? 30 : null
+        }        
+      },
+      _verification () {
+        // Verification timeout policy
+        if (this.enable 
+          && (this.waitCompleteTimeout.enable && !this.waitCompleteTimeout.strategy.length)
+          || (this.waitStartTimeout.enable && !this.waitStartTimeout.strategy.length)) {
+          this.$message.warning(`${this.$t('Timeout strategy must be selected')}`)
+          return false
+        }
+        // Verify timeout duration Non 0 positive integer
+        const reg = /^[1-9]\d*$/
+        if (this.enable 
+          && (this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval))
+          || (this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
+          this.$message.warning(`${this.$t('Timeout must be a positive integer')}`)
+          return false
+        }
+        // Verify timeout duration longer than check interval
+        if (this.enable && this.waitStartTimeout.enable && this.waitStartTimeout.checkInterval >= this.waitStartTimeout.interval) {
+          this.$message.warning(`${this.$t('Timeout must be longer than check interval')}`)
+          return false
+        }
+        this.$emit('on-timeout', {
+          waitStartTimeout: {
+            strategy: 'FAILED',
+            interval: parseInt(this.waitStartTimeout.interval),
+            checkInterval: parseInt(this.waitStartTimeout.checkInterval),
+            enable: this.waitStartTimeout.enable
+          },
+          waitCompleteTimeout: {
+            strategy: (() => {
+            // Handling checkout sequence
+            let strategy = this.waitCompleteTimeout.strategy
+            if (strategy.length === 2 && strategy[0] === 'FAILED') {
+              return [strategy[1], strategy[0]].join(',')
+            } else {
+              return strategy.join(',')
+            }
+          })(),
+          interval: parseInt(this.waitCompleteTimeout.interval),
+          enable: this.waitCompleteTimeout.enable
+          }
+        })
+        return true
+      }
+    },
+    watch: {
+    },
+    created () {
+      let o = this.backfillItem
+      // Non-null objects represent backfill
+      if (!_.isEmpty(o)) {
+        if (o.timeout) {
+          this.enable = true
+          this.waitCompleteTimeout.enable = o.timeout.enable || false
+          this.waitCompleteTimeout.strategy = _.split(o.timeout.strategy, ',') || ['WARN']
+          this.waitCompleteTimeout.interval = o.timeout.interval || null
+        }
+        if (o.waitStartTimeout) {
+          this.enable = true
+          this.waitStartTimeout.enable = o.waitStartTimeout.enable || false
+          this.waitStartTimeout.strategy = ['FAILED']
+          this.waitStartTimeout.interval = o.waitStartTimeout.interval || null
+          this.waitStartTimeout.checkInterval = o.waitStartTimeout.checkInterval || null
+        }
+      }
+    },
+    mounted () {
+    },
+    components: {}
+  }
+</script>

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

@@ -162,10 +162,18 @@
 
         <!-- Task timeout alarm -->
         <m-timeout-alarm
+          v-if="taskType !== 'DEPENDENT'"
           ref="timeout"
           :backfill-item="backfillItem"
           @on-timeout="_onTimeout">
         </m-timeout-alarm>
+        <!-- Dependent timeout alarm -->
+        <m-dependent-timeout
+          v-if="taskType === 'DEPENDENT'"
+          ref="dependentTimeout"
+          :backfill-item="backfillItem"
+          @on-timeout="_onDependentTimeout">
+        </m-dependent-timeout>
 
         <!-- shell node -->
         <m-shell
@@ -315,6 +323,7 @@
   import mSubProcess from './tasks/sub_process'
   import mSelectInput from './_source/selectInput'
   import mTimeoutAlarm from './_source/timeoutAlarm'
+  import mDependentTimeout from './_source/dependentTimeout'
   import mWorkerGroups from './_source/workerGroups'
   import mPreTasks from './tasks/pre_tasks'
   import clickoutside from '@/module/util/clickoutside'
@@ -363,6 +372,8 @@
         delayTime: '0',
         // Task timeout alarm
         timeout: {},
+        // (For Dependent nodes) Wait start timeout alarm
+        waitStartTimeout: {},
         // Task priority
         taskInstancePriority: 'MEDIUM',
         // worker group id
@@ -424,6 +435,13 @@
       _onTimeout (o) {
         this.timeout = Object.assign(this.timeout, {}, o)
       },
+      /**
+       * Dependent timeout alarm
+       */
+      _onDependentTimeout (o) {
+        this.timeout = Object.assign(this.timeout, {}, o.waitCompleteTimeout)
+        this.waitStartTimeout = Object.assign(this.waitStartTimeout, {}, o.waitStartTimeout)
+      },
       /**
        * Click external to close the current component
        */
@@ -502,6 +520,7 @@
             retryInterval: this.retryInterval,
             delayTime: this.delayTime,
             timeout: this.timeout,
+            waitStartTimeout: this.waitStartTimeout,
             taskInstancePriority: this.taskInstancePriority,
             workerGroup: this.workerGroup,
             status: this.status,
@@ -555,9 +574,16 @@
           return
         }
         // Verify task alarm parameters
-        if (!this.$refs['timeout']._verification()) {
+        if (this.taskType === 'DEPENDENT') {
-          return
+          if (!this.$refs['dependentTimeout']._verification()) {
+            return
+          }
+        } else {
+          if (!this.$refs['timeout']._verification()) {
+            return
+          }
         }
+        
         // Verify node parameters
         if (!this.$refs[this.taskType]._verification()) {
           return
@@ -618,6 +644,7 @@
             retryInterval: this.retryInterval,
             delayTime: this.delayTime,
             timeout: this.timeout,
+            waitStartTimeout: this.waitStartTimeout,
             taskInstancePriority: this.taskInstancePriority,
             workerGroup: this.workerGroup,
             status: this.status,
@@ -785,6 +812,7 @@
           retryInterval: this.retryInterval,
           delayTime: this.delayTime,
           timeout: this.timeout,
+          waitStartTimeout: this.waitStartTimeout,
           taskInstancePriority: this.taskInstancePriority,
           workerGroup: this.workerGroup,
           successBranch: this.successBranch,
@@ -810,6 +838,7 @@
       mConditions,
       mSelectInput,
       mTimeoutAlarm,
+      mDependentTimeout,
       mPriority,
       mWorkerGroups,
       mPreTasks,

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -426,6 +426,10 @@ export default {
   'Timeout alarm': 'Timeout alarm',
   'Timeout failure': 'Timeout failure',
   'Timeout period': 'Timeout period',
+  'Waiting Dependent complete': 'Waiting Dependent complete',
+  'Waiting Dependent start': 'Waiting Dependent start',
+  'Check interval': 'Check interval',
+  'Timeout must be longer than check interval': 'Timeout must be longer than check interval',
   'Timeout strategy must be selected': 'Timeout strategy must be selected',
   'Timeout must be a positive integer': 'Timeout must be a positive integer',
   'Add dependency': 'Add dependency',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -420,8 +420,12 @@ export default {
   'Timeout alarm': '超时告警',
   'Timeout failure': '超时失败',
   'Timeout period': '超时时长',
+  'Waiting Dependent complete': '等待依赖完成',
+  'Waiting Dependent start': '等待依赖启动',
+  'Check interval': '检查间隔',
   'Timeout strategy must be selected': '超时策略必须选一个',
   'Timeout must be a positive integer': '超时时长必须为正整数',
+  'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
   'Add dependency': '添加依赖',
   and: '且',
   or: '或',
@@ -432,6 +436,7 @@ export default {
   Running: '正在运行',
   'Waiting for dependency to complete': '等待依赖完成',
   'Delay execution': '延时执行',
+  'Forced success': '强制成功过',
   Selected: '已选',
   CurrentHour: '当前小时',
   Last1Hour: '前1小时',