fix race-condition in scheduler thread

Fixes Grails-Plugin-Consortium#29
uberall · Jan 9, 2019 · 00994ed · 00994ed
1 parent a0b4abd
commit 00994ed
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/grails-app/services/grails/plugins/jesque/JesqueSchedulerService.groovy b/grails-app/services/grails/plugins/jesque/JesqueSchedulerService.groovy
@@ -104,10 +104,6 @@ class JesqueSchedulerService {
             if (!waitingJobs)
                 return []
 
-            //only get and wait for jobs with the exact time until something like quartz batchTimeWindow is implemented
-            def earliestWaitingJobTime = waitingJobs.min { it.score }.score
-            waitingJobs.findAll { it.score == earliestWaitingJobTime }
-
             //lock jobs
             waitingJobs.inject([]) { List<Tuple> acquiredJobs, Tuple jobData ->
                 String jobName = jobData.element
@@ -120,6 +116,12 @@ class JesqueSchedulerService {
                     return acquiredJobs
                 }
 
+                if (jobData.score != trigger.nextFireTime.millis) {
+                    log.debug "Trigger nextFireTime has been changed: job $jobName was already executed by another thread"
+                    redis.unwatch()
+                    return acquiredJobs
+                }
+
                 trigger.state = TriggerState.Acquired
                 trigger.acquiredBy = hostName
                 Transaction transaction = redis.multi()