sbmt-outbox 6.4.3 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17535824e7b8a62fa7695b25c1be0b53b0bcfb7bff9b8015fec31aaed28ca95b
-  data.tar.gz: d668f93fe5109170fc1571bd88ccf503f3bc776e406fc32d3ffe1ec130097a8d
+  metadata.gz: e88f22ff7adf6d76e9fb116d0de7d825986114fc4e68a289e286c5e3d9d24fde
+  data.tar.gz: f3ec1429fba3c58bc741ab2c6ebbe9cc1483716cc703a76385c90c09f1e70e24
 SHA512:
-  metadata.gz: 80ce2a3aad22f1fa4244d4a86fe8682858abe605bfcf8ac2751a8688fad87f14f7cc141f6ead9ea4e8e47137d95639d3d984724dac31867a4878881f90054786
-  data.tar.gz: 4dca4cbe2d50415fcf76f5db3243484ad52e9adfbb0a9ac6947bd1cd134e50558cba7432a20782dd5fdd91c95185005312602fefda976a7c48a4b9e0969abde8
+  metadata.gz: a4afedde029080834e7d379402c7832b5d6dfaa6c1d86c25b38358bc95fb9b7db2d1ade8458a2b28750f2a6a8247bede8838198a7b15cb1397b944f6a0e4b174
+  data.tar.gz: 7524112c3ec1e28a594af7fd44bd7cb18bd0e52dc199fa6c327314245e3ca41160aaf28922d94cdedb59c56f7faf528871a216f0d02dae11023c599f62bb2acf

data/app/jobs/sbmt/outbox/base_delete_stale_items_job.rb

@@ -64,9 +64,12 @@ module Sbmt
       def delete_stale_items(waterline)
         logger.log_info("Start deleting #{box_type} items for #{box_name} older than #{waterline}")
 
-        scope = item_class.where("created_at < ?", waterline)
+        loop do
+          ids = Outbox.database_switcher.use_slave do
+            item_class.where("created_at < ?", waterline).limit(BATCH_SIZE).ids
+          end
+          break if ids.empty?
 
-        while (ids = scope.limit(BATCH_SIZE).ids).present?
           item_class.where(id: ids).delete_all
           sleep SLEEP_TIME
         end

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

@@ -94,7 +94,7 @@ module Sbmt
             end
           end
         rescue Cutoff::CutoffExceededError
-          box_worker.job_timeout_counter.increment(labels)
+          box_worker.job_timeout_counter.increment(task.yabeda_labels)
           logger.log_info("Lock timeout while processing #{task.resource_key} at id #{last_id}")
         end
 

data/lib/sbmt/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module Outbox
-    VERSION = "6.4.3"
+    VERSION = "6.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-outbox
 version: !ruby/object:Gem::Version
-  version: 6.4.3
+  version: 6.5.0
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -636,7 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Outbox service