From c2175c59c50014ad7c266ec6102bca50ea13ea41 Mon Sep 17 00:00:00 2001 From: irector2016 <85151441@qq.com> Date: Thu, 19 Jan 2017 19:14:10 +0800 Subject: [PATCH 1/2] Update MysqlExecutingJobQueue.java --- .../ltsopensource/queue/mysql/MysqlExecutingJobQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 5b125b580..cadd7b2b2 100644 --- 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 getDeadJobs(long deadline) { .all() .from() .table(getTableName()) - .where("gmt_created < ?", deadline) + .where("gmt_modified < ?", deadline) .list(RshHolder.JOB_PO_LIST_RSH); } From fb5590c433fd831c27c1862a1326a2fabdeb458b Mon Sep 17 00:00:00 2001 From: irector2016 <85151441@qq.com> Date: Thu, 19 Jan 2017 19:33:13 +0800 Subject: [PATCH 2/2] Update JobSender.java --- .../com/github/ltsopensource/jobtracker/sender/JobSender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 3664ae848..f6f544074 100644 --- 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 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));