Merge pull request ltsopensource#370 from lusong1986/repeatjob-repeat…

…edcount-bug 修复Repeatjob执行完成后不能删除job（不依赖上周期）和不能更新repeatedCount（依赖上周期）的bug
duguhan520 · Sep 1, 2017 · e5652a2 · e5652a2
2 parents 0f493f4 + 7c29a61
commit e5652a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...btracker/src/main/java/com/github/ltsopensource/jobtracker/complete/JobFinishHandler.java b/...btracker/src/main/java/com/github/ltsopensource/jobtracker/complete/JobFinishHandler.java
@@ -127,7 +127,11 @@ private void finishNoReplyPrevRepeatJob(JobMeta jobMeta, boolean isRetryForThisT
         // 如果当前完成的job是重试的,那么不要增加repeatedCount
         if (!isRetryForThisTime) {
             // 更新repeatJob的重复次数
-            appContext.getRepeatJobQueue().incRepeatedCount(jobPo.getJobId());
+            final int jobQueueRepeatedCount = appContext.getRepeatJobQueue().incRepeatedCount(jobPo.getJobId());
+            if (jobQueueRepeatedCount >= jobPo.getRepeatCount()) {
+                appContext.getRepeatJobQueue().remove(jobPo.getJobId());
+                jobRemoveLog(jobPo, "Repeat");
+            }
         }
     }
 

diff --git a/...obtracker/src/main/java/com/github/ltsopensource/jobtracker/complete/JobRetryHandler.java b/...obtracker/src/main/java/com/github/ltsopensource/jobtracker/complete/JobRetryHandler.java
@@ -87,7 +87,9 @@ public void onComplete(List<JobRunResult> results) {
                             nextRetryTriggerTime = nexTriggerTime;
                             jobPo = repeatJobPo;
                         } else {
-                            jobPo.setInternalExtParam(Constants.IS_RETRY_JOB, Boolean.TRUE.toString());
+                            if(jobPo.getRetryTimes() < repeatJobPo.getMaxRetryTimes()) { //最后一次重试时，这个参数不能设置，为了在finishHandler时能执行到incRepeatedCount
+                               jobPo.setInternalExtParam(Constants.IS_RETRY_JOB, Boolean.TRUE.toString());
+                            }
                         }
                     }
                 }