sidekiq-ultimate 0.0.1.alpha → 0.0.1.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21eb153f8f9af214ece524d28299bb23e2a1918d90a8b99e41a63031eeb4037b
-  data.tar.gz: 9b930c25ddedb5177da9ee3bad6756c37f156355e9c639c00ecf8f5803016aeb
+  metadata.gz: 668c153d01d544b176281fcdaf5774abcb1757c9466ddbed19504265093ea846
+  data.tar.gz: 54cabd4c8392a1754f206489c4ed9dd523f1d6fb4e4711bcb7efc5d3db8540a4
 SHA512:
-  metadata.gz: b38096795e63949611c87f0c42f35314ba7c0ec64b459fb91e6bb794e65aef2994c807a7d06873bedf92e78a343fedfcb95ece065478c5c1e0abf6a0b9d614c3
-  data.tar.gz: f36223cef6b03277f7090c0e5b1d3b33aeb70b7157c31205adbfc24d7a5ce4199499bd49ca215acfeac008a21d86973f321736326651e117594d0cd0fa031b9e
+  metadata.gz: 4250c73685481db1974a6fac3ae1eced983d6f8af142d1dc445159593c61769525882a463b9b05bd76403ec65ddf0cd32fbb97ca87b66f3c185703a8bc9e5784
+  data.tar.gz: fc8f850e024baad6b917c43ec285b8fff056ab26d9770fb20223ddfb1673037a652b6e02d18dcbdb4ea37edeaedcc4497ff26ee169e28134cc5e12c9202281ae

data/lib/sidekiq/ultimate/resurrector.rb

@@ -3,12 +3,19 @@
 require "redis/lockers"
 require "redis/prescription"
 
+require "sidekiq/ultimate/queue_name"
+
 module Sidekiq
   module Ultimate
     # Lost jobs resurrector.
     module Resurrector
-      LPOPRPUSH = Redis::Prescription.read("#{__dir__}/lpoprpush.lua")
-      private_constant :LPOPRPUSH
+      RESURRECT = Redis::Prescription.read \
+        "#{__dir__}/resurrector/resurrect.lua"
+      private_constant :RESURRECT
+
+      SAFECLEAN = Redis::Prescription.read \
+        "#{__dir__}/resurrector/safeclean.lua"
+      private_constant :SAFECLEAN
 
       MAIN_KEY = "ultimate:resurrector"
       private_constant :MAIN_KEY
@@ -18,30 +25,36 @@ module Sidekiq
 
       class << self
         def setup!
-          ctulhu = Concurrent::TimerTask.new(:execution_interval => 5) do
-            resurrect!
-          end
+          ctulhu = nil
 
           Sidekiq.on(:startup) do
-            register_process!
-            ctulhu.execute
+            defibrillate!
+
+            ctulhu = Concurrent::TimerTask.execute(:run_now => true) do
+              resurrect!
+            end
           end
 
-          Sidekiq.on(:shutdown) { ctulhu.shutdown }
+          Sidekiq.on(:shutdown) { ctulhu&.shutdown }
+
+          Sidekiq.on(:heartbeat) { defibrillate! }
         end
 
         def resurrect!
           lock do
             casualties.each do |identity|
-              queues(identity).each { |queue| resurrect(queue) }
-              cleanup(identity)
+              queues = queues_of(identity).each { |queue| resurrect(queue) }
+              cleanup(identity, queues.map(&:inproc))
             end
           end
+        rescue => e
+          Sidekiq.logger.error("#{self}.resurrect! failed: #{e}")
+          raise
         end
 
         private
 
-        def register_process!
+        def defibrillate!
           Sidekiq.redis do |redis|
             queues   = JSON.dump(Sidekiq.options[:queues].uniq)
             identity = Object.new.tap { |o| o.extend Sidekiq::Util }.identity
@@ -68,7 +81,7 @@ module Sidekiq
           end
         end
 
-        def queues(identity)
+        def queues_of(identity)
           Sidekiq.redis do |redis|
             queues = redis.hget(MAIN_KEY, identity)
 
@@ -82,16 +95,17 @@ module Sidekiq
 
         def resurrect(queue)
           Sidekiq.redis do |redis|
-            kwargs = { :keys => [queue.inproc, queue.pending] }
-            count  = 0
-
-            count += 1 while LPOPRPUSH.eval(redis, **kwargs)
-            redis.del(queue.inproc)
+            RESURRECT.eval(redis, :keys => [queue.inproc, queue.pending])
           end
         end
 
-        def cleanup(identity)
-          Sidekiq.redis { |redis| redis.hdel(MAIN_KEY, identity) }
+        def cleanup(identity, inprocs)
+          Sidekiq.redis do |redis|
+            SAFECLEAN.eval(redis, {
+              :keys => [MAIN_KEY, *inprocs],
+              :argv => [identity]
+            })
+          end
         end
       end
     end

data/lib/sidekiq/ultimate/resurrector/resurrect.lua

@@ -0,0 +1,13 @@
+local src = KEYS[1]
+local dst = KEYS[2]
+local val = nil
+
+while true do
+  val = redis.call("LPOP", src)
+
+  if val then
+    redis.call("RPUSH", dst, val)
+  else
+    return
+  end
+end

data/lib/sidekiq/ultimate/resurrector/safeclean.lua

@@ -0,0 +1,15 @@
+local rip = true
+
+for i, v in ipairs(KEYS) do
+  if 2 < i then
+    if 0 == redis.call("LLEN", v) then
+      redis.call("DEL", v)
+    else
+      rip = false
+    end
+  end
+end
+
+if rip then
+  redis.call("HDEL", KEYS[1], ARGV[1])
+end

data/lib/sidekiq/ultimate/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Ultimate
     # Gem version.
-    VERSION = "0.0.1.alpha"
+    VERSION = "0.0.1.alpha.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.1.alpha.2
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -114,9 +114,10 @@ files:
 - lib/sidekiq/ultimate.rb
 - lib/sidekiq/ultimate/expirable_list.rb
 - lib/sidekiq/ultimate/fetch.rb
-- lib/sidekiq/ultimate/lpoprpush.lua
 - lib/sidekiq/ultimate/queue_name.rb
 - lib/sidekiq/ultimate/resurrector.rb
+- lib/sidekiq/ultimate/resurrector/resurrect.lua
+- lib/sidekiq/ultimate/resurrector/safeclean.lua
 - lib/sidekiq/ultimate/unit_of_work.rb
 - lib/sidekiq/ultimate/version.rb
 - sidekiq-ultimate.gemspec

data/lib/sidekiq/ultimate/lpoprpush.lua

@@ -1,9 +0,0 @@
-local src = KEYS[1]
-local dst = KEYS[2]
-local val = redis.call("LPOP", src)
-
-if val then
-  redis.call("RPUSH", dst, val)
-end
-
-return val