From 61fcad772299ce369b1c130c5f7fb0516b1bdc92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=81=9A=E9=98=B3?= <yinancx@live.com>
Date: Tue, 29 Sep 2020 14:49:33 +0800
Subject: [PATCH] add timeout verification

---
 .../pages/dag/_source/formModel/_source/dependentTimeout.vue | 5 +++++
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js       | 1 +
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js       | 2 ++
 3 files changed, 8 insertions(+)

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 235fb08412..2b2ed78ccc 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
@@ -161,6 +161,11 @@
           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',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 50d03ef555..5148849d3b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -429,6 +429,7 @@ export default {
   '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',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 3f4be67b1e..9341d4fd2b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -425,6 +425,7 @@ export default {
   'Check interval': '检查间隔',
   'Timeout strategy must be selected': '超时策略必须选一个',
   'Timeout must be a positive integer': '超时时长必须为正整数',
+  'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
   'Add dependency': '添加依赖',
   and: '且',
   or: '或',
@@ -435,6 +436,7 @@ export default {
   Running: '正在运行',
   'Waiting for dependency to complete': '等待依赖完成',
   'Delay execution': '延时执行',
+  'Forced success': '强制成功过',
   Selected: '已选',
   CurrentHour: '当前小时',
   Last1Hour: '前1小时',