sbmt-outbox 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818de79692d37138c630bf2fce625a54becf3a8fa71eafe3c5435d573dbcf665
-  data.tar.gz: 2516c414d14a60851d53fd9f821845179ac12cfb88176a18c1f60d8ba8e38bc9
+  metadata.gz: d7ed66a6f328704ae2838f6c0d4b8f6c42788d546d227ef3035d6774bd84e38c
+  data.tar.gz: 5e7eac918594e2268757d25aba26d18da783d50d31f5cf61e03bb921c2390e6a
 SHA512:
-  metadata.gz: 0e1c0f1f55ef75e5c73352f0789dc51559656f5868a64f2ca8b0c97c10b2865cd37189dc6b3a5d0346673251800ed1c652df951734a5fe77029ca87dbb0fc1a3
-  data.tar.gz: f0aba9307dcfac3c8e330f1a8a1e40e33439a624c4c40c34ea9223c53c25acff2540ad03c72b00a71c1e963885ecee4e6befc5e5e94d4d78e13ecf6acac4c69e
+  metadata.gz: af1f6fa94feb668716256f9a9e4c462585da9341da9823b2d960c5af2e6b392fc4736eb3cfbfb80cc8a255399ba80c01b9b6cdf6f28644dbdbd1538e8342dd94
+  data.tar.gz: 35957d9cc3e507b708f6b74cb1da20a687dfd0b251321a03f22245e9de6ebd73ea40cfa5620ffe4a7b6a2822b8411582385ae5681b8fe809165ef2da88f11882

data/lib/sbmt/outbox/engine.rb

@@ -48,7 +48,7 @@ module Sbmt
           pc.threads_count = 4
           pc.general_timeout = 120
           pc.cutoff_timeout = 60
-          pc.brpop_delay = 2
+          pc.brpop_delay = 1
         end
 
         c.database_switcher = "Sbmt::Outbox::DatabaseSwitcher"

data/lib/sbmt/outbox/v2/poll_throttler/rate_limited.rb

@@ -8,15 +8,36 @@ module Sbmt
     module V2
       module PollThrottler
         class RateLimited < Base
+          attr_reader :queues
+
           def initialize(limit: nil, interval: nil, balanced: true)
-            @queue = Limiter::RateQueue.new(limit, interval: interval, balanced: balanced)
+            @limit = limit
+            @interval = interval
+            @balanced = balanced
+            @queues = {}
+            @mutex = Mutex.new
           end
 
-          def wait(_worker_num, _poll_task, _task_result)
-            @queue.shift
+          def wait(_worker_num, poll_task, _task_result)
+            queue_for(poll_task).shift
 
             Success(Sbmt::Outbox::V2::Throttler::THROTTLE_STATUS)
           end
+
+          private
+
+          def queue_for(task)
+            key = task.item_class.box_name
+            return @queues[key] if @queues.key?(key)
+
+            @mutex.synchronize do
+              return @queues[key] if @queues.key?(key)
+
+              @queues[key] = Limiter::RateQueue.new(
+                @limit, interval: @interval, balanced: @balanced
+              )
+            end
+          end
         end
       end
     end

data/lib/sbmt/outbox/v2/processor.rb

@@ -12,6 +12,8 @@ module Sbmt
         delegate :processor_config, :batch_process_middlewares, :logger, to: "Sbmt::Outbox"
         attr_reader :lock_timeout, :brpop_delay
 
+        REDIS_BRPOP_MIN_DELAY = 0.1
+
         def initialize(
           boxes,
           threads_count: nil,
@@ -20,7 +22,7 @@ module Sbmt
           redis: nil
         )
           @lock_timeout = lock_timeout || processor_config.general_timeout
-          @brpop_delay = brpop_delay || processor_config.brpop_delay
+          @brpop_delay = brpop_delay || redis_brpop_delay(boxes.count, processor_config.brpop_delay)
 
           super(boxes: boxes, threads_count: threads_count || processor_config.threads_count, name: "processor", redis: redis)
         end
@@ -95,6 +97,12 @@ module Sbmt
         def redis_block_timeout
           redis.read_timeout + brpop_delay
         end
+
+        def redis_brpop_delay(boxes_count, default_delay)
+          return default_delay if boxes_count == 1
+
+          REDIS_BRPOP_MIN_DELAY
+        end
       end
     end
   end

data/lib/sbmt/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module Outbox
-    VERSION = "6.0.0"
+    VERSION = "6.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-outbox
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team