upperkut 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 610726bb89a40550a7aebd91196d982e667a5dee5dd37679b3b120a8402d2874
-  data.tar.gz: 707172c85bbf22f04a8c2bb5436e5dec749d42e5bc7893e33818f2e51139f78e
+  metadata.gz: b61a3728cde5e295de277abc22836653fc332640843bce69f3ca3832f830a1ec
+  data.tar.gz: f781b92bd8923e67e3f26a207904ee4b80bf54104bc98364559d4924a5b3c5e2
 SHA512:
-  metadata.gz: f9e88a6c5382cfd1cd7aa250b3830ad2aec804d4d1715938f2dc38bb66cad313c4ce5c9de6b94d1ad311025597fe5401ad0175a0fef1e24f95da8936a006adba
-  data.tar.gz: f33ffc495ec7653169ab8a3a1576cfa3fdafa60d751ff11815fe58c4a0a774703c0ed522f3713890ddb740a184c4ae187d641562fb49b650df8c651e774ca5ec
+  metadata.gz: 961de37230a1db0d1c8162b9a7e25f69715f647f154b3b36e66aef2568d0620235fbeaa5b92bcfefdb5189bcee0b1de98220e0db6811ee7dc3477114bdea3758
+  data.tar.gz: f509c2623813dd4132b1df11dc220de1082f441078a5ddc96b753fec9d47c87ea62851af45dd4257c60578e83b0647a36ef6a8f1a643a5748cbf58751206403d

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Upperkut changes
 0.8.x
 --------
+- Added exponential backoff when push_items #57
 - Introducing Item to avoid losing enqueued at and report wrong latency
-  metrics, thanks to @jeangnc
+  metrics #56 thanks to @jeangnc
 
 0.7.x
 ---------

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upperkut (0.8.0)
+    upperkut (0.8.1)
       connection_pool (~> 2.2, >= 2.2.2)
       redis (>= 4.1.0, < 5.0.0)
 

data/lib/upperkut/strategies/buffered_queue.rb

@@ -102,8 +102,10 @@ module Upperkut
       def redis
         raise ArgumentError, 'requires a block' unless block_given?
 
-        redis_pool.with do |conn|
-          yield conn
+        retry_block do
+          redis_pool.with do |conn|
+            yield conn
+          end
         end
       end
 

data/lib/upperkut/strategies/priority_queue.rb

@@ -182,8 +182,10 @@ module Upperkut
       def redis
         raise ArgumentError, 'requires a block' unless block_given?
 
-        redis_pool.with do |conn|
-          yield conn
+        retry_block do
+          redis_pool.with do |conn|
+            yield conn
+          end
         end
       end
 

data/lib/upperkut/strategies/scheduled_queue.rb

@@ -28,9 +28,13 @@ module Upperkut
 
       def initialize(worker, options = {})
         @options = options
-        initialize_options
-        @redis_pool = setup_redis_pool
+        @redis_options = @options.fetch(:redis, {})
         @worker = worker
+
+        @batch_size = @options.fetch(
+          :batch_size,
+          Integer(ENV['UPPERKUT_BATCH_SIZE'] || 1000)
+        )
       end
 
       def push_items(items = [])
@@ -82,13 +86,12 @@ module Upperkut
 
       private
 
-      def initialize_options
-        @redis_options = @options.fetch(:redis, {})
+      def key
+        "upperkut:queued:#{to_underscore(@worker.name)}"
+      end
 
-        @batch_size = @options.fetch(
-          :batch_size,
-          Integer(ENV['UPPERKUT_BATCH_SIZE'] || 1000)
-        )
+      def ensure_timestamp_attr(item)
+        item['timestamp'] = Time.now.utc.to_i unless item.key?('timestamp')
       end
 
       def pop_values(redis_client, args)
@@ -123,26 +126,24 @@ module Upperkut
         now_timestamp - job['timestamp'].to_f
       end
 
-      def setup_redis_pool
-        return @redis_options if @redis_options.is_a?(ConnectionPool)
-
-        RedisPool.new(options.fetch(:redis, {})).create
-      end
-
       def redis
         raise ArgumentError, 'requires a block' unless block_given?
 
-        @redis_pool.with do |conn|
-          yield conn
+        retry_block do
+          redis_pool.with do |conn|
+            yield conn
+          end
         end
       end
 
-      def ensure_timestamp_attr(item)
-        item['timestamp'] = Time.now.utc.to_i unless item.key?('timestamp')
-      end
-
-      def key
-        "upperkut:queued:#{to_underscore(@worker.name)}"
+      def redis_pool
+        @redis_pool ||= begin
+                          if @redis_options.is_a?(ConnectionPool)
+                            @redis_options
+                          else
+                            RedisPool.new(@redis_options).create
+                          end
+                        end
       end
     end
   end

data/lib/upperkut/util.rb

@@ -36,5 +36,22 @@ module Upperkut
         memo << Item.from_json(item) if item
       end
     end
+
+    def retry_block(retries_limit = 3, base_sleep = 2)
+      retries = 0
+
+      begin
+        yield
+      rescue StandardError => err
+        if retries < retries_limit
+          retries += 1
+          sleep_time = base_sleep**retries
+          Kernel.sleep(sleep_time)
+          retry
+        end
+
+        raise err
+      end
+    end
   end
 end

data/lib/upperkut/version.rb

@@ -1,3 +1,3 @@
 module Upperkut
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upperkut
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Nando Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool