提供Job级别的重试次数,用户可以针对每个job设置最大重试次数, 用户需要升级数据表结构

yanghongkjxy · Mar 13, 2016 · 8c73213 · 8c73213
1 parent c5cf74f
commit 8c73213
Show file tree

Hide file tree

Showing 28 changed files with 151 additions and 94 deletions.
diff --git a/lts-admin/src/main/java/com/lts/admin/web/api/JobQueueApi.java b/lts-admin/src/main/java/com/lts/admin/web/api/JobQueueApi.java
@@ -520,6 +520,7 @@ private KVPair<Boolean, String> addJob(JobQueueReq request) {
             job.setTriggerTime(request.getTriggerTime().getTime());
         }
         job.setPriority(request.getPriority());
+        job.setMaxRetryTimes(request.getMaxRetryTimes() == null ? 0 : request.getMaxRetryTimes());
 
         return addJob(job);
     }

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/cronJobQueue.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/cronJobQueue.vm
@@ -125,6 +125,14 @@
                                        placeholder="必须为数字，数值越小，优先级越大【必填】">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label w_120">最大重试次数</label>
+
+                            <div class="col-sm-3 w_250">
+                                <input type="text" class="form-control" name="maxRetryTimes" value="0"
+                                       placeholder="最大重试次数, 必须为非负数【必填】">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label w_120">提交节点组</label>
 
@@ -184,6 +192,7 @@
             <th>执行节点组</th>
             <th>Cron表达式</th>
             <th data-hide="all">优先级</th>
+            <th data-hide="all">最大重试次数</th>
             <th>反馈客户端</th>
             <th data-hide="all">用户参数</th>
             <th data-hide="phone,tablet">创建时间</th>
@@ -199,6 +208,7 @@
             <td>{{row.taskTrackerNodeGroup}}</td>
             <td>{{row.cronExpression}}</td>
             <td>{{row.priority}}</td>
+            <td>{{row.maxRetryTimes}}</td>
             <td>{{row.needFeedback | format:'needFeedbackLabel',row}}</td>
             <td>{{row.extParams | format:'stringifyJSON'}}</td>
             <td>{{row.gmtCreated | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -285,6 +295,9 @@
                     value = value + '';
                 }
                 if($(this)[0].tagName.toUpperCase() == 'SELECT'){
+                    if(!value){
+                        value = "";
+                    }
                     $(this).selectpicker('val', value);
                 }else{
                     $(this).val(value);
@@ -323,6 +336,10 @@
                 sweetAlert("请选择执行节点组", "如果列表中没有，请在节点组管理中添加，并启动改节点。", "error");
                 return;
             }
+            if(!params['maxRetryTimes'] || !/^\d+$/.test(params['maxRetryTimes'])){
+                sweetAlert("最大重试次数必须为非负整数", "最大重试次数必须为非负整数", "error");
+                return;
+            }
             var extParams = params['extParams'];
             if (extParams) {
                 try {

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/executableJobQueue.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/executableJobQueue.vm
@@ -129,6 +129,14 @@
                                        placeholder="必须为数字，数值越小，优先级越大【必填】">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label w_120">最大重试次数</label>
+
+                            <div class="col-sm-3 w_250">
+                                <input type="text" class="form-control" name="maxRetryTimes" value="0"
+                                       placeholder="最大重试次数, 必须为非负数【必填】">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label w_120">提交节点组</label>
 
@@ -177,7 +185,8 @@
             <th>执行时间</th>
             <th>Cron表达式</th>
             <th data-hide="all">优先级</th>
-            <th data-hide="all">重试次数</th>
+            <th data-hide="all">当前重试次数</th>
+            <th data-hide="all">最大重试次数</th>
             <th>反馈客户端</th>
             <th data-hide="all">用户参数</th>
             <th data-hide="phone,tablet">创建时间</th>
@@ -195,6 +204,7 @@
             <td>{{row.cronExpression}}</td>
             <td>{{row.priority}}</td>
             <td>{{row.retryTimes}}</td>
+            <td>{{row.maxRetryTimes}}</td>
             <td>{{row.needFeedback | format:'needFeedbackLabel',row}}</td>
             <td>{{row.extParams | format:'stringifyJSON'}}</td>
             <td>{{row.gmtCreated | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -325,6 +335,10 @@
                 sweetAlert("请选择提交节点组", "需要反馈客户端必须选择提交节点组,如果列表中没有，请在节点组管理中添加，并启动改节点。", "error");
                 return;
             }
+            if(!params['maxRetryTimes'] || !/^\d+$/.test(params['maxRetryTimes'])){
+                sweetAlert("最大重试次数必须为非负整数", "最大重试次数必须为非负整数", "error");
+                return;
+            }
             var extParams = params['extParams'];
             if (extParams) {
                 try {

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/executingJobQueue.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/executingJobQueue.vm
@@ -94,7 +94,8 @@
             <th>Cron表达式</th>
             <th data-hide="all">优先级</th>
             <th>反馈客户端</th>
-            <th>重试次数</th>
+            <th>当前重试次数</th>
+            <th>最大重试次数</th>
             <th data-hide="all">用户参数</th>
             <th data-hide="phone,tablet">创建时间</th>
             <th data-hide="all">修改时间</th>
@@ -111,6 +112,7 @@
             <td>{{row.priority}}</td>
             <td>{{row.needFeedback | format:'needFeedbackLabel',row}}</td>
             <td>{{row.retryTimes}}</td>
+            <td>{{row.maxRetryTimes}}</td>
             <td>{{row.extParams | format:'stringifyJSON'}}</td>
             <td>{{row.gmtCreated | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>
             <td>{{row.gmtModified | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/jobAdd.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/jobAdd.vm
@@ -70,6 +70,14 @@
                                        placeholder="必须为数字，数值越小，优先级越大【必填】">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">最大重试次数</label>
+
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control" name="maxRetryTimes" value="0"
+                                       placeholder="最大重试次数, 必须为非负数【必填】">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">提交节点组</label>
 
@@ -194,6 +202,10 @@
                 sweetAlert("请选择执行节点组", "如果列表中没有，请在节点组管理中添加，并启动改节点。", "error");
                 return;
             }
+            if(!params['maxRetryTimes'] || !/^\d+$/.test(params['maxRetryTimes'])){
+                sweetAlert("最大重试次数必须为非负整数", "最大重试次数必须为非负整数", "error");
+                return;
+            }
 
             var extParams = params['extParams'];
             if (extParams) {

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/jobLogger.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/jobLogger.vm
@@ -99,7 +99,8 @@
             <th>日志类型</th>
             <th>执行结果</th>
             <th data-hide="all">日志级别</th>
-            <th data-hide="all">重试次数</th>
+            <th data-hide="all">当前重试次数</th>
+            <th data-hide="all">最大重试次数</th>
             <th data-hide="all">优先级</th>
             <th data-hide="all">执行时间</th>
             <th>Cron表达式</th>
@@ -121,6 +122,7 @@
             <td>{{row.success | format:'successLabel'}}</td>
             <td>{{row.level}}</td>
             <td>{{row.retryTimes}}</td>
+            <td>{{row.maxRetryTimes}}</td>
             <td>{{row.priority}}</td>
             <td>{{row.triggerTime | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>
             <td>{{row.cronExpression}}</td>

diff --git a/lts-admin/src/main/webapp/WEB-INF/views/templates/suspendJobQueue.vm b/lts-admin/src/main/webapp/WEB-INF/views/templates/suspendJobQueue.vm
@@ -125,6 +125,14 @@
                                        placeholder="必须为数字，数值越小，优先级越大【必填】">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label w_120">最大重试次数</label>
+
+                            <div class="col-sm-3 w_250">
+                                <input type="text" class="form-control" name="maxRetryTimes" value="0"
+                                       placeholder="最大重试次数, 必须为非负数【必填】">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label w_120">提交节点组</label>
 
@@ -184,6 +192,7 @@
             <th>执行节点组</th>
             <th>Cron表达式</th>
             <th data-hide="all">优先级</th>
+            <th data-hide="all">最大重试次数</th>
             <th>反馈客户端</th>
             <th data-hide="all">用户参数</th>
             <th data-hide="phone,tablet">创建时间</th>
@@ -199,6 +208,7 @@
             <td>{{row.taskTrackerNodeGroup}}</td>
             <td>{{row.cronExpression}}</td>
             <td>{{row.priority}}</td>
+            <td>{{row.maxRetryTimes}}</td>
             <td>{{row.needFeedback | format:'needFeedbackLabel',row}}</td>
             <td>{{row.extParams | format:'stringifyJSON'}}</td>
             <td>{{row.gmtCreated | dateFormat:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -323,6 +333,10 @@
                 sweetAlert("请选择执行节点组", "如果列表中没有，请在节点组管理中添加，并启动改节点。", "error");
                 return;
             }
+            if(!params['maxRetryTimes'] || !/^\d+$/.test(params['maxRetryTimes'])){
+                sweetAlert("最大重试次数必须为非负整数", "最大重试次数必须为非负整数", "error");
+                return;
+            }
             var extParams = params['extParams'];
             if (extParams) {
                 try {

diff --git a/lts-admin/src/test/java/com/lts/H2DatabaseTest.java b/lts-admin/src/test/java/com/lts/H2DatabaseTest.java
diff --git a/lts-core/src/main/java/com/lts/admin/request/JobQueueReq.java b/lts-core/src/main/java/com/lts/admin/request/JobQueueReq.java
@@ -34,6 +34,8 @@ public class JobQueueReq extends PaginationReq {
 
     private Integer priority;
 
+    private Integer maxRetryTimes;
+
     public String getJobId() {
         return jobId;
     }
@@ -137,4 +139,12 @@ public Date getTriggerTime() {
     public void setTriggerTime(Date triggerTime) {
         this.triggerTime = triggerTime;
     }
+
+    public Integer getMaxRetryTimes() {
+        return maxRetryTimes;
+    }
+
+    public void setMaxRetryTimes(Integer maxRetryTimes) {
+        this.maxRetryTimes = maxRetryTimes;
+    }
 }
diff --git a/lts-core/src/main/java/com/lts/biz/logger/domain/JobLogPo.java b/lts-core/src/main/java/com/lts/biz/logger/domain/JobLogPo.java
@@ -48,6 +48,7 @@ public class JobLogPo {
     private Long triggerTime;
 
     private Integer retryTimes = 0;
+    private Integer maxRetryTimes = 0;
 
     public Integer getRetryTimes() {
         return retryTimes;
@@ -184,4 +185,12 @@ public Long getLogTime() {
     public void setLogTime(Long logTime) {
         this.logTime = logTime;
     }
+
+    public Integer getMaxRetryTimes() {
+        return maxRetryTimes;
+    }
+
+    public void setMaxRetryTimes(Integer maxRetryTimes) {
+        this.maxRetryTimes = maxRetryTimes;
+    }
 }
diff --git a/lts-core/src/main/java/com/lts/biz/logger/mysql/MysqlJobLogger.java b/lts-core/src/main/java/com/lts/biz/logger/mysql/MysqlJobLogger.java
@@ -70,7 +70,8 @@ private InsertSql buildInsertSql() {
                         "need_feedback",
                         "cron_expression",
                         "trigger_time",
-                        "retry_times");
+                        "retry_times",
+                        "max_retry_times");
     }
 
     private InsertSql setInsertSqlValues(InsertSql insertSql, JobLogPo jobLogPo) {
@@ -90,7 +91,8 @@ private InsertSql setInsertSqlValues(InsertSql insertSql, JobLogPo jobLogPo) {
                 jobLogPo.isNeedFeedback(),
                 jobLogPo.getCronExpression(),
                 jobLogPo.getTriggerTime(),
-                jobLogPo.getRetryTimes());
+                jobLogPo.getRetryTimes(),
+                jobLogPo.getMaxRetryTimes());
     }
 
     @Override