que-scheduler 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e2783e68e146ba7ba266c283c887e256963b451
-  data.tar.gz: 55c52e08b23cab6ef75e3b9c8e8d0cc368f123c2
+  metadata.gz: a0e9f48536b268d1387f247f8a7ee52a55dbfef5
+  data.tar.gz: 148ab173c0eb5c22a6cfd6bf83fb7e846570c705
 SHA512:
-  metadata.gz: 551365361fc0f13a520c396243577d972fed0b8b3dfe798fb92990f2d1b2779bf79544b9dfb6a258439bcd5bc17a773c45bb142fa39f3b9930eec8b7487fba5d
-  data.tar.gz: 363661214b0d6375a813ecc68b9dbd04e1cf367dca2ff978a9047a7e2aa99825df1ae64ebda7f533919a628845f804cea4f8ea9c32a6cb805754c61a80e10f8e
+  metadata.gz: 508e5271f7f35b62b6704a4f7633d026e149ede22f7f6497af8296aed7fd5c1bfcd8d1fbdd6b4ce4ec03adc59dedae195500830453038bfe0f33fb77c99f49ec
+  data.tar.gz: f18b35343f7a9075db5771b2c2f2917fb49df8efcd81fe055e5c048e2742d21623051291d81f5527af7b15664e178cd3eeac9516cc96d5c11060cf1e233e593f

data/lib/que/scheduler/scheduler_job.rb

@@ -24,8 +24,15 @@ module Que
         ::ActiveRecord::Base.transaction do
           scheduler_job_args = SchedulerJobArgs.prepare_scheduler_job_args(options)
           logs = ["que-scheduler last ran at #{scheduler_job_args.last_run_time}."]
-          result = enqueue_required_jobs(scheduler_job_args, logs)
-          enqueue_self_again(scheduler_job_args, result.schedule_dictionary)
+
+          # It's possible one worker node has severe clock skew, and reports a time earlier than
+          # the last run. If so, log, and rescheduled with the same last run at.
+          if scheduler_job_args.as_time < scheduler_job_args.last_run_time
+            SchedulerJob.handle_clock_skew(scheduler_job_args, logs)
+          else
+            # Otherwise, run as normal
+            SchedulerJob.handle_normal_call(scheduler_job_args, logs)
+          end
 
           # Only now we're sure nothing errored, log the results
           logs.each { |str| Que.log(message: str) }
@@ -35,27 +42,6 @@ module Que
 
       private
 
-      def enqueue_required_jobs(scheduler_job_args, logs)
-        # Obtain the hash of missed jobs. Keys are the job classes, and the values are arrays
-        # each containing more arrays for the arguments of that instance.
-        result = ScheduleParser.parse(SchedulerJob.scheduler_config, scheduler_job_args)
-        result.missed_jobs.each do |job_class, args_arrays|
-          args_arrays.each do |args|
-            logs << "que-scheduler enqueueing #{job_class} with options: #{args}"
-            job_class.enqueue(*args)
-          end
-        end
-        result
-      end
-
-      def enqueue_self_again(scheduler_job_args, new_job_dictionary)
-        SchedulerJob.enqueue(
-          last_run_time: scheduler_job_args.as_time.iso8601,
-          job_dictionary: new_job_dictionary,
-          run_at: scheduler_job_args.as_time.beginning_of_minute + SCHEDULER_FREQUENCY
-        )
-      end
-
       class << self
         def scheduler_config
           @scheduler_config ||= begin
@@ -80,6 +66,46 @@ module Que
             )
           end
         end
+
+        def handle_normal_call(scheduler_job_args, logs)
+          result = enqueue_required_jobs(scheduler_job_args, logs)
+          enqueue_self_again(
+            scheduler_job_args.as_time,
+            scheduler_job_args.as_time,
+            result.schedule_dictionary
+          )
+        end
+
+        def enqueue_required_jobs(scheduler_job_args, logs)
+          # Obtain the hash of missed jobs. Keys are the job classes, and the values are arrays
+          # each containing more arrays for the arguments of that instance.
+          result = ScheduleParser.parse(SchedulerJob.scheduler_config, scheduler_job_args)
+          result.missed_jobs.each do |job_class, args_arrays|
+            args_arrays.each do |args|
+              logs << "que-scheduler enqueueing #{job_class} with options: #{args}"
+              job_class.enqueue(*args)
+            end
+          end
+          result
+        end
+
+        def enqueue_self_again(last_full_execution, this_run_time, new_job_dictionary)
+          SchedulerJob.enqueue(
+            last_run_time: last_full_execution.iso8601,
+            job_dictionary: new_job_dictionary,
+            run_at: this_run_time.beginning_of_minute + SCHEDULER_FREQUENCY
+          )
+        end
+
+        def handle_clock_skew(scheduler_job_args, logs)
+          logs << 'que-scheduler detected worker with time older than last run. ' \
+                      'Rescheduling without enqueueing jobs.'
+          enqueue_self_again(
+            scheduler_job_args.last_run_time,
+            scheduler_job_args.as_time,
+            scheduler_job_args.job_dictionary
+          )
+        end
       end
     end
   end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Harry Lascelles
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: fugit
+  name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: que
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: backports
+  name: que
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0.10'
 description: A lightweight cron scheduler for the async job worker Que
 email:
 - harry@harrylascelles.com