sqeduler 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf402d8f9a9fa71478dbaf7d240c132e0eebb07
-  data.tar.gz: b372b39855ad6c9c1cd65815cb3b9b1215248bf7
+  metadata.gz: abf3832836e43f9513299831abcce9bc67551ed1
+  data.tar.gz: eee3fc43d7e4d7aa106e7ff244f8029932feda94
 SHA512:
-  metadata.gz: 9b4352281ee3d6bb49b2c802e6d254f02c6d89ae3224149877bc2db6cd35ff60ac4a0201b824aef0b37b6825fd6e280d0a988c5993085c75e7a17440bb17905a
-  data.tar.gz: 7c1fdb476cd81993adb418188d3fb6cec45f625c4a96ac842ff5fbe92cc87d4109aac4e30cbb45d27ff45a7bb1e215691769c82647bdf5a2702b215565ddd4d3
+  metadata.gz: e984434cc1cd0c5fbe44f34b85a1fa75d520d2de2e635a0ba3e848ad195dcc6015e0cf00495e2cc41fe30fdfcb3988cbf2e7aac7a5c24d547f6c6a95dc3d998d
+  data.tar.gz: c5cc39b2699fb6da450f3c8dd32c4da5eadd11775820b3420af024d1376598ca51f09a4fae376b60ef6761cb75fe3323a411ecebfcf7ef0a51b4df7cf582e9a8

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 0.3.2 / 2016-03-10
+
+* Fixed lock refresher failing to lock properly for exclusive runs
+* Added debug logs for lock refresher 
+
 ### 0.3.1 / 2016-02-17
 
 * Fixed lock refresh checking timeout rather than expiration for finding eligible jobs

data/lib/sqeduler/lock_maintainer.rb

@@ -17,9 +17,16 @@ module Sqeduler
       @maintainer_thread ||= Thread.new do
         loop do
           begin
-            synchronize
+            if redis_lock.lock
+              begin
+                synchronize
+              ensure
+                redis_lock.unlock
+              end
+            end
+
           rescue => ex
-            Service.logger.error "[SQEDULER LOCK MAINTAINER] #{ex.class}, #{ex.message}"
+            Service.logger.error "[#{self.class}] #{ex.class}, #{ex.message}"
           end
 
           sleep RUN_INTERVAL + rand(RUN_JITTER)
@@ -30,10 +37,6 @@ module Sqeduler
     private
 
     def synchronize
-      # Not great, but finding our identity in Sidekiq is a pain, and we already have locks in Sqeduler.
-      # Easier to just try and grab a lock each time and whichever server wins gets to do it.
-      return unless redis_lock.send(:take_lock)
-
       now = Time.now.to_i
 
       Service.redis_pool do |redis|
@@ -51,6 +54,9 @@ module Sqeduler
             # We don't have to worry about atomic operations or anything like that.
             # If the job finishes in the interim and deletes the key nothing will happen.
             redis.expire(lock_key, klass.synchronize_jobs_expiration)
+
+            Service.logger.debug "[#{self.class}] Refreshing lock on '#{lock_key}" \
+              "to #{klass.synchronize_jobs_expiration} seconds"
           end
         end
       end
@@ -64,10 +70,12 @@ module Sqeduler
       if klass.respond_to?(:synchronize_jobs_mode)
         # We only care about exclusive jobs that are long running
         if klass.synchronize_jobs_mode == :one_at_a_time && klass.synchronize_jobs_expiration >= RUN_INTERVAL
+          Service.logger.debug "[#{self.class}] Adding #{class_name} to the whitelist of classes that have locks"
           return @class_with_locks[class_name] = klass
         end
       end
 
+      Service.logger.debug "[#{self.class}] Adding #{class_name} to the blacklist of classes that have locks"
       @class_with_locks[class_name] = false
     end
 

data/lib/sqeduler/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sqeduler
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq