Merge pull request ltsopensource#328 from irector2016/patch-3

修复--将已经正常完成的任务错误识别为死任务，并重新执行的问题
helango-seabiscuit · Jan 20, 2017 · 2fec990 · 2fec990
2 parents 05b13b3 + fb5590c
commit 2fec990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lts-core/src/main/java/com/github/ltsopensource/queue/mysql/MysqlExecutingJobQueue.java b/lts-core/src/main/java/com/github/ltsopensource/queue/mysql/MysqlExecutingJobQueue.java
@@ -60,7 +60,7 @@ public List<JobPo> getDeadJobs(long deadline) {
                 .all()
                 .from()
                 .table(getTableName())
-                .where("gmt_created < ?", deadline)
+                .where("gmt_modified < ?", deadline)
                 .list(RshHolder.JOB_PO_LIST_RSH);
     }
 

diff --git a/lts-jobtracker/src/main/java/com/github/ltsopensource/jobtracker/sender/JobSender.java b/lts-jobtracker/src/main/java/com/github/ltsopensource/jobtracker/sender/JobSender.java
@@ -68,7 +68,7 @@ private List<JobPo> fetchJob(String taskTrackerNodeGroup, String taskTrackerIden
 
             // IMPORTANT: 这里要先切换队列
             try {
-                jobPo.setGmtModified(jobPo.getGmtCreated());
+                jobPo.setGmtModified(SystemClock.now());
                 appContext.getExecutingJobQueue().add(jobPo);
             } catch (DupEntryException e) {
                 LOGGER.warn("ExecutingJobQueue already exist:" + JSON.toJSONString(jobPo));