#400 立即终止和超时强杀增加告警提示

vipshop · Apr 23, 2018 · 54bcb17 · 54bcb17
1 parent c4290d1
commit 54bcb17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/saturn-console-web/src/pages/job_detail/job_detail.vue b/saturn-console-web/src/pages/job_detail/job_detail.vue
@@ -59,7 +59,7 @@ export default {
   methods: {
     handleOperate(operation) {
       if (operation === 'stopAtOnce') {
-        this.$message.confirmMessage(`确认立即终止作业 ${this.jobName} 吗?`, () => {
+        this.$message.confirmMessage(`警告：对于Java作业，立即终止操作（即强杀）会stop业务线程，如果作业代码没有实现postForceStop方法来释放资源，有可能导致资源的不释放，例如数据库连接的不释放。确认立即终止作业 ${this.jobName} 吗?`, () => {
           this.operateRequest(operation);
         });
       } else {

diff --git a/saturn-console-web/src/pages/job_detail/job_setting.vue b/saturn-console-web/src/pages/job_detail/job_setting.vue
@@ -20,7 +20,7 @@
                                 <el-form-item prop="cron" label="Cron">
                                     <el-tooltip popper-class="form-tooltip" content="作业启动时间的cron表达式。如每10秒运行:*/10****?,每5分钟运行:0*/5***?" placement="bottom">
                                         <el-input v-model="jobSettingInfo.cron">
-                                            <el-button slot="append" @click="checkAndForecastCron" style="margin-top: -15px">预测</el-button>
+                                            <el-button slot="append" @click="checkAndForecastCron">预测</el-button>
                                         </el-input>
                                     </el-tooltip>
                                 </el-form-item>
@@ -120,7 +120,12 @@
                             </el-col>
                             <el-col :span="11">
                                 <el-form-item prop="timeoutSeconds" label="超时强杀(秒)">
-                                    <el-input v-model="jobSettingInfo.timeoutSeconds"></el-input>
+                                    <el-tooltip popper-class="form-tooltip" placement="top" effect="light">
+                                        <div slot="content">
+                                            <span class="text-warning">警告：对于Java作业，立即终止操作（即强杀）会stop业务线程，如果作业代码没有实现postForceStop方法来释放资源，有可能导致资源的不释放，例如数据库连接的不释放。</span>
+                                        </div>
+                                        <el-input v-model="jobSettingInfo.timeoutSeconds"></el-input>
+                                    </el-tooltip>
                                 </el-form-item>
                             </el-col>
                         </el-row>

diff --git a/saturn-console-web/src/pages/job_list/job_info_dialog.vue b/saturn-console-web/src/pages/job_list/job_info_dialog.vue
@@ -23,7 +23,7 @@
                     <el-col :span="18">
                         <el-tooltip popper-class="form-tooltip" content="作业启动时间的cron表达式。如每10秒运行:*/10****?,每5分钟运行:0*/5***?" placement="bottom">
                             <el-input v-model="jobInfo.cron">
-                                <el-button slot="append" @click="checkAndForecastCron" style="margin-top: -15px">预测</el-button>
+                                <el-button slot="append" @click="checkAndForecastCron">预测</el-button>
                             </el-input>
                         </el-tooltip>
                     </el-col>