Merge pull request #248 from ltsopensource/develop

优化Repeat  任务策略

Author: qq254963746

lts-admin/src/main/java/com/lts/admin/web/api/RepeatJobQueueApi.java

@@ -59,7 +59,7 @@ public RestfulResponse repeatJobUpdate(JobQueueReq request) {
             try {
                 // 如果repeatInterval有修改,需要把triggerTime也要修改下
                 if (!request.getRepeatInterval().equals(jobPo.getRepeatInterval())) {
-                    long nextTriggerTime = JobUtils.getRepeatTriggerTime(jobPo);
+                    long nextTriggerTime = JobUtils.getRepeatNextTriggerTime(jobPo);
                     request.setTriggerTime(new Date(nextTriggerTime));
                 }
                 // 把等待执行的队列也更新一下

lts-admin/src/main/java/com/lts/admin/web/api/SuspendJobQueueApi.java

@@ -79,7 +79,7 @@ public RestfulResponse suspendJobUpdate(String jobType, JobQueueReq request) {
                 }
                 // 如果repeatInterval有修改,需要把triggerTime也要修改下
                 if (!request.getRepeatInterval().equals(jobPo.getRepeatInterval())) {
-                    long nextTriggerTime = JobUtils.getRepeatTriggerTime(jobPo);
+                    long nextTriggerTime = JobUtils.getRepeatNextTriggerTime(jobPo);
                     request.setTriggerTime(new Date(nextTriggerTime));
                 }
                 request.setCronExpression(null);
@@ -161,7 +161,7 @@ public RestfulResponse suspendJobRecovery(JobQueueReq request) {
                 try {
                     // 2. add to executable queue
                     JobPo repeatJob = appContext.getRepeatJobQueue().getJob(request.getJobId());
-                    long nextTriggerTime = JobUtils.getRepeatTriggerTime(repeatJob);
+                    long nextTriggerTime = JobUtils.getRepeatNextTriggerTime(repeatJob);
                     jobPo.setTriggerTime(nextTriggerTime);
                     appContext.getExecutableJobQueue().add(jobPo);
                 } catch (DupEntryException e) {

lts-admin/src/main/webapp/WEB-INF/views/templates/repeatJobQueue.vm

@@ -271,7 +271,7 @@
             }, function (isConfirm) {
                 if (isConfirm) {
                     $.ajax({
-                        url: 'api/job-queue/cron-job-delete',
+                        url: 'api/job-queue/repeat-job-delete',
                         type: 'POST',
                         dataType: 'json',
                         data: {jobId: jobId, taskTrackerNodeGroup: taskTrackerNodeGroup},

lts-core/src/main/java/com/lts/core/support/JobUtils.java

@@ -10,12 +10,12 @@ public class JobUtils {
 
     public static long getRepeatNextTriggerTime(JobPo jobPo) {
         long firstTriggerTime = Long.valueOf(jobPo.getInternalExtParam(Constants.QUARTZ_FIRST_FIRE_TIME));
-        return firstTriggerTime + (jobPo.getRepeatedCount() + 1) * jobPo.getRepeatInterval();
-    }
-
-    public static long getRepeatTriggerTime(JobPo jobPo) {
-        long firstTriggerTime = Long.valueOf(jobPo.getInternalExtParam(Constants.QUARTZ_FIRST_FIRE_TIME));
-        return firstTriggerTime + jobPo.getRepeatedCount() * jobPo.getRepeatInterval();
+        long now = SystemClock.now();
+        long remainder = (now - firstTriggerTime) % jobPo.getRepeatInterval();
+        if (remainder == 0) {
+            return now;
+        }
+        return now + (jobPo.getRepeatInterval() - remainder);
     }
 
 }

lts-core/src/main/java/com/lts/zookeeper/lts/ZkException.java

@@ -26,15 +26,15 @@ public ZkException(Throwable cause) {
     public boolean isZkNoNodeException() {
         Throwable cause = getCause();
         if (cause != null && cause instanceof KeeperException) {
-            return KeeperException.Code.NONODE.intValue() != ((KeeperException) cause).getCode();
+            return KeeperException.Code.NONODE != ((KeeperException) cause).code();
         }
         return false;
     }
 
     public boolean isZkNodeExistsException() {
         Throwable cause = getCause();
         if (cause != null && cause instanceof KeeperException) {
-            return KeeperException.Code.NODEEXISTS.intValue() != ((KeeperException) cause).getCode();
+            return KeeperException.Code.NODEEXISTS != ((KeeperException) cause).code();
         }
         return false;
     }