mini_scheduler 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61de19d47b5090c36a179869a01800506ee364629db64f47df963426c1d9a8b6
-  data.tar.gz: faa1b86a2d625fa570b26dd8ad8a2ccdb15fcd6029f1d93ad67ddefb0301342a
+  metadata.gz: d84546928a92e57ef72f4af8a5125c6d1ac12cddd32cd3b4203f819754b8c754
+  data.tar.gz: a5a8406b9c15ef74ea8729991137ebcc37f80ea4a367e7f9ce5da11cc6620ab9
 SHA512:
-  metadata.gz: 931ae1731d9c1b49b3c861ec5b401d317e436f9548494c6fc9cd7b242c5d9bd932459bdf5598f9e7ca24abe8c46d585a43d75cac8a2772f7a04bc77fcf6ad27d
-  data.tar.gz: 82ef45be2249b8c5d6834aeeb13f3f72e4b23604436a68246bba46350ad49255d0f9adf6ac262f685c189d9fc6670c8247776ab3b2d4eaf1f9b7e55b87a63515
+  metadata.gz: c8b0a9e24bc8b785ffb0a4a01b4cef24a403604ec92851d862533b306ceab23008dad5419a7833e7c4f625d32206604f3308360db8942f61b7c254b0c2603a1d
+  data.tar.gz: e2f99830e4ede44cd66fba4d206cb6d2c16e712e0df30888a8677ec8b5ac6db78d3538da92769985cc84e8f211025f1682c51aa41716a034e39a5b49cdeeb56a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.11.0 - 24-06-2019
+
+- Correct situation where distributed mutex could end in a tight loop when
+ redis could not be contacted
+
 # 0.9.2 - 26-04-2019
 
 - Correct UI so it displays durations that are longer than a minute

data/app/models/mini_scheduler/stat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(ActiveRecord::Base)
   module MiniScheduler
     class Stat < ActiveRecord::Base

data/lib/generators/mini_scheduler/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 require 'active_record'

data/lib/generators/mini_scheduler/install/templates/create_mini_scheduler_stats.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateMiniSchedulerStats < ActiveRecord::Migration[4.2]
   def change
     create_table :scheduler_stats do |t|

data/lib/generators/mini_scheduler/install/templates/mini_scheduler_initializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 MiniScheduler.configure do |config|
   # An instance of Redis. See https://github.com/redis/redis-rb
 

data/lib/mini_scheduler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "mini_scheduler/engine"
 require 'mini_scheduler/schedule'
 require 'mini_scheduler/schedule_info'

data/lib/mini_scheduler/distributed_mutex.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module MiniScheduler
   class DistributedMutex
+    class Timeout < StandardError; end
 
     @default_redis = nil
 
@@ -18,11 +21,26 @@ module MiniScheduler
       @mutex = Mutex.new
     end
 
+    MAX_POLLING_ATTEMPTS ||= 60
+    BASE_SLEEP_DURATION ||= 0.001
+    MAX_SLEEP_DURATION ||= 1
+
     # NOTE wrapped in mutex to maintain its semantics
     def synchronize
       @mutex.lock
+
+      attempts = 0
+      sleep_duration = BASE_SLEEP_DURATION
       while !try_to_get_lock
-        sleep 0.001
+
+        sleep(sleep_duration)
+
+        if sleep_duration < MAX_SLEEP_DURATION
+          sleep_duration = [sleep_duration * 2, MAX_SLEEP_DURATION].min
+        end
+
+        attempts += 1
+        raise Timeout if attempts >= MAX_POLLING_ATTEMPTS
       end
 
       yield

data/lib/mini_scheduler/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(::Rails)
   module MiniScheduler
     class Engine < ::Rails::Engine

data/lib/mini_scheduler/manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniScheduler
   class Manager
     attr_accessor :random_ratio, :redis, :enable_stats, :queue
@@ -8,6 +10,8 @@ module MiniScheduler
         @mutex = Mutex.new
         @queue = Queue.new
         @manager = manager
+        @hostname = manager.hostname
+
         @reschedule_orphans_thread = Thread.new do
           while !@stopped
             sleep 60
@@ -45,20 +49,17 @@ module MiniScheduler
       end
 
       def hostname
-        @hostname ||= begin
-                        `hostname`
-                      rescue
-                        "unknown"
-                      end
+        @hostname
       end
 
       def process_queue
 
         klass = @queue.deq
-        return unless klass
-
         # hack alert, I need to both deq and set @running atomically.
         @running = true
+
+        return if !klass
+
         failed = false
         start = Time.now.to_f
         info = @mutex.synchronize { @manager.schedule_info(klass) }
@@ -145,7 +146,8 @@ module MiniScheduler
           sleep 0.001
         end
         # this is a hack, but is only used for test anyway
-        sleep 0.001
+        # if tests fail that depend on this we are forced to increase it.
+        sleep 0.010
         while @running
           sleep 0.001
         end
@@ -169,7 +171,6 @@ module MiniScheduler
 
     def initialize(options = nil)
       @queue = options && options[:queue] || "default"
-
       @redis = MiniScheduler.redis
       @random_ratio = 0.1
       unless options && options[:skip_runner]
@@ -192,7 +193,11 @@ module MiniScheduler
     end
 
     def hostname
-      @hostname ||= `hostname`.strip
+      @hostname ||= begin
+                      `hostname`.strip
+                    rescue
+                      "unknown"
+                    end
     end
 
     def schedule_info(klass)

data/lib/mini_scheduler/schedule.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniScheduler::Schedule
 
   def queue(value = nil)

data/lib/mini_scheduler/schedule_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniScheduler
   class ScheduleInfo
     attr_accessor :next_run,

data/lib/mini_scheduler/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniScheduler
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/mini_scheduler/web.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Based off sidetiq https://github.com/tobiassvn/sidetiq/blob/master/lib/sidetiq/web.rb
 module MiniScheduler
   module Web

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq