sidekiq-ultimate 0.0.1.alpha.4 → 0.0.1.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48fa760a3af0b2e932d2a5415dc25b4d7cd86df32f17b47b86f2ba23d3968d34
-  data.tar.gz: 9dc5bf6963d3f343e67fc9b59a1072adb1cb7959651d7262f8768dfda8b32ff3
+  metadata.gz: 3f0176019d0fa6bd44ec34fb292e7caafdaa78ab4c8d5dc33c03f2f933b5db74
+  data.tar.gz: ab8225dae6c14e67784ef3147cad83e1d1597df234626837207d6fd8ba783997
 SHA512:
-  metadata.gz: e1d7e93bd40dab574eff3bc6455e23ef2a59946d41e220a81bac3716350e3a23036dfb0d9f5c1fe0fb6e546e96bc191adbbb6c7a8dc9fe286334a6d852c4c160
-  data.tar.gz: 605d4e1d9d1a8250fb017a2ff005a2046ada578ff55938cf1126f574c78d42e518ab4d4f6843373b1a552e7686c52b9c0f910e3aed09af1a0ac00c844df933bb
+  metadata.gz: d222fcb849ad439eddb9957c6b4fc9c87010181e5b97dc217eaf512402902137671141f090ab3a431fba12d13c145e11d5c6bcd477c94319e267daebfcbfeb97
+  data.tar.gz: f5ec33ba4bbf1159ec79f12dc4c416f6a79b77f64c4f161bf85690f40173702c513e475884e84dc127a24bc6373b32dc8e84bd59e64dcab36cfd45e8b48ab946

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

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

data/lib/sidekiq/ultimate/resurrector.rb

@@ -51,6 +51,8 @@ module Sidekiq
         def resurrect!
           lock do
             casualties.each do |identity|
+              Sidekiq.logger.debug { "[#{self}] Resurrecting #{identity}" }
+
               queues = queues_of(identity).each { |queue| resurrect(queue) }
               cleanup(identity, queues.map(&:inproc))
             end
@@ -101,7 +103,15 @@ module Sidekiq
 
         def resurrect(queue)
           Sidekiq.redis do |redis|
-            RESURRECT.eval(redis, :keys => [queue.inproc, queue.pending])
+            count = RESURRECT.eval(redis, {
+              :keys => [queue.inproc, queue.pending]
+            })
+
+            if count.positive?
+              Sidekiq.logger.info do
+                "[#{self}] Resurrected #{count} jobs of #{queue.inspect}"
+              end
+            end
           end
         end
 

data/lib/sidekiq/ultimate/unit_of_work/requeue.lua

@@ -0,0 +1,2 @@
+redis.call(ARGV[1], KEYS[1], ARGV[2])
+redis.call("LREM", KEYS[2], -1, ARGV[2])

data/lib/sidekiq/ultimate/unit_of_work.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "redis/prescription"
+
 require "sidekiq/throttled"
 
 module Sidekiq
@@ -8,6 +10,10 @@ module Sidekiq
     #
     # @private
     class UnitOfWork
+      REQUEUE = Redis::Prescription.read \
+        "#{__dir__}/unit_of_work/requeue.lua"
+      private_constant :REQUEUE
+
       # JSON payload
       #
       # @return [String]
@@ -49,7 +55,7 @@ module Sidekiq
       #
       # @return [void]
       def requeue
-        # do nothing
+        __requeue__("RPUSH")
       end
 
       # Pushes job back to the head of the queue, so that job won't be tried
@@ -60,12 +66,7 @@ module Sidekiq
       #
       # @return [void]
       def requeue_throttled
-        Sidekiq.redis do |redis|
-          redis.pipelined do
-            redis.lpush(@queue.pending, @job)
-            acknowledge
-          end
-        end
+        __requeue__("LPUSH")
       end
 
       # Tells whenever job should be pushed back to queue (throttled) or not.
@@ -75,6 +76,17 @@ module Sidekiq
       def throttled?
         Sidekiq::Throttled.throttled?(@job)
       end
+
+      private
+
+      def __requeue__(command)
+        Sidekiq.redis do |redis|
+          REQUEUE.eval(redis, {
+            :keys => [@queue.pending, @queue.inproc],
+            :argv => [command, @job]
+          })
+        end
+      end
     end
   end
 end

data/lib/sidekiq/ultimate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-ultimate
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.4
+  version: 0.0.1.alpha.5
 platform: ruby
 authors:
 - Alexey Zapparov
@@ -119,6 +119,7 @@ files:
 - lib/sidekiq/ultimate/resurrector/resurrect.lua
 - lib/sidekiq/ultimate/resurrector/safeclean.lua
 - lib/sidekiq/ultimate/unit_of_work.rb
+- lib/sidekiq/ultimate/unit_of_work/requeue.lua
 - lib/sidekiq/ultimate/version.rb
 - sidekiq-ultimate.gemspec
 homepage: https://github.com/sensortower/sidekiq-ultimate