for exp

Author: qq254963746

lts-jobtracker/src/main/java/com/lts/jobtracker/processor/JobFinishedProcessor.java

@@ -277,6 +277,7 @@ private JobPushRequest getNewJob(String taskTrackerNodeGroup, String taskTracker
             application.getExecutingJobQueue().add(jobPo);
         } catch (DuplicateJobException e) {
             // ignore
+            LOGGER.error(e.getMessage(), e);
         }
         application.getExecutableJobQueue().remove(jobPo.getTaskTrackerNodeGroup(), jobPo.getJobId());
 
@@ -304,37 +305,42 @@ private void finishProcess(List<TaskTrackerJobResult> results) {
         for (TaskTrackerJobResult result : results) {
 
             JobWrapper jobWrapper = result.getJobWrapper();
-            // 移除
-            application.getExecutingJobQueue().remove(jobWrapper.getJobId());
 
-            if (jobWrapper.getJob().isSchedule()) {
+            try {
+                if (jobWrapper.getJob().isSchedule()) {
 
-                JobPo cronJobPo = application.getCronJobQueue().finish(jobWrapper.getJobId());
-                if (cronJobPo == null) {
-                    // 可能任务队列中改条记录被删除了
-                    return;
-                }
-                Date nextTriggerTime = CronExpressionUtils.getNextTriggerTime(cronJobPo.getCronExpression());
-                if (nextTriggerTime == null) {
-                    application.getCronJobQueue().remove(jobWrapper.getJobId());
-                } else {
+                    JobPo cronJobPo = application.getCronJobQueue().finish(jobWrapper.getJobId());
+                    if (cronJobPo == null) {
+                        // 可能任务队列中改条记录被删除了
+                        return;
+                    }
+                    Date nextTriggerTime = CronExpressionUtils.getNextTriggerTime(cronJobPo.getCronExpression());
+                    if (nextTriggerTime == null) {
+                        application.getCronJobQueue().remove(jobWrapper.getJobId());
+                        return;
+                    }
                     // 表示下次还要执行
                     try {
                         cronJobPo.setTaskTrackerIdentity(null);
                         cronJobPo.setIsRunning(false);
                         cronJobPo.setTriggerTime(nextTriggerTime.getTime());
                         cronJobPo.setGmtModified(SystemClock.now());
                         application.getExecutableJobQueue().add(cronJobPo);
-                    } catch (DuplicateJobException ignore) {
+                    } catch (DuplicateJobException e) {
+                        LOGGER.error(e.getMessage(), e);
                     }
                 }
+            } finally {
+                // 移除
+                application.getExecutingJobQueue().remove(jobWrapper.getJobId());
             }
         }
     }
 
     /**
      * 将任务加入重试队列
      */
+
     private void retryProcess(List<TaskTrackerJobResult> results) {
         if (CollectionUtils.isEmpty(results)) {
             return;
@@ -363,7 +369,8 @@ private void retryProcess(List<TaskTrackerJobResult> results) {
                                 cronJobPo.setTriggerTime(nextTriggerTime.getTime());
                                 cronJobPo.setGmtModified(SystemClock.now());
                                 application.getExecutableJobQueue().add(cronJobPo);
-                            } catch (DuplicateJobException ignore) {
+                            } catch (DuplicateJobException e) {
+                                LOGGER.error(e.getMessage(), e);
                             }
                             needAdd = false;
                         }
@@ -378,7 +385,8 @@ private void retryProcess(List<TaskTrackerJobResult> results) {
                     jobPo.setTriggerTime(nextRetryTriggerTime);
                     try {
                         application.getExecutableJobQueue().add(jobPo);
-                    } catch (DuplicateJobException ignore) {
+                    } catch (DuplicateJobException e) {
+                        LOGGER.error(e.getMessage(), e);
                     }
                 }
                 // 从正在执行的队列中移除

lts-jobtracker/src/main/java/com/lts/jobtracker/support/JobPusher.java

@@ -171,6 +171,7 @@ public void operationComplete(ResponseFuture responseFuture) {
             application.getExecutingJobQueue().add(jobPo);
         } catch (DuplicateJobException e) {
             // ignore
+            LOGGER.error(e.getMessage(), e);
         }
         application.getExecutableJobQueue().remove(jobPo.getTaskTrackerNodeGroup(), jobPo.getJobId());
         // 记录日志

lts-jobtracker/src/main/java/com/lts/jobtracker/support/checker/ExecutingDeadJobChecker.java

@@ -181,8 +181,9 @@ private void fixDeadJob(JobPo jobPo) {
             // 1. add to executable queue
             try {
                 application.getExecutableJobQueue().add(jobPo);
-            } catch (DuplicateJobException ignore) {
+            } catch (DuplicateJobException e) {
                 // ignore
+                LOGGER.error(e.getMessage(), e);
             }
             // 2. remove from executing queue
             application.getExecutingJobQueue().remove(jobPo.getJobId());