sbmt-outbox 6.4.3 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17535824e7b8a62fa7695b25c1be0b53b0bcfb7bff9b8015fec31aaed28ca95b
-  data.tar.gz: d668f93fe5109170fc1571bd88ccf503f3bc776e406fc32d3ffe1ec130097a8d
+  metadata.gz: a86388ca6b13cdaef9411bd8baf1ea045fcc1b941721cdb8d4fb15bda4db29be
+  data.tar.gz: 6fbc5a6e5d62df9aaf1cf2f0afdc3cf49e8bf5ccdc0a49d86a0b8feb8e51f200
 SHA512:
-  metadata.gz: 80ce2a3aad22f1fa4244d4a86fe8682858abe605bfcf8ac2751a8688fad87f14f7cc141f6ead9ea4e8e47137d95639d3d984724dac31867a4878881f90054786
-  data.tar.gz: 4dca4cbe2d50415fcf76f5db3243484ad52e9adfbb0a9ac6947bd1cd134e50558cba7432a20782dd5fdd91c95185005312602fefda976a7c48a4b9e0969abde8
+  metadata.gz: bca4330c17aa8d6d8f6563ebc52dae02d9029fb01580b9294ffd5d20822768f95f5c41a0c5bdd733d9f6481632f44a754ce67079cf843e9cf3c58ada9f9fbb39
+  data.tar.gz: 3c24bf5fa9af05b1ef48f38ff20519466c5f63a47a1acbb5bf788d7e197c8af17759581c52443b8650c8ff4f3680bbd48aee3a8b224623e6097176aa284c5a11

data/README.md

@@ -122,7 +122,7 @@ Rails.application.config.outbox.tap do |config|
   config.paths << Rails.root.join("config/outbox.yml").to_s # optional; configuration file paths, deep merged at the application start, useful with Rails engines
 
   # optional (worker v2: default)
-  c.poller = ActiveSupport::OrderedOptions.new.tap do |pc|
+  config.poller = ActiveSupport::OrderedOptions.new.tap do |pc|
     # max parallel threads (per box-item, globally)
     pc.concurrency = 6
     # max threads count (per worker process)
@@ -152,7 +152,7 @@ Rails.application.config.outbox.tap do |config|
   end
 
   # optional (worker v2: default)
-  c.processor = ActiveSupport::OrderedOptions.new.tap do |pc|
+  config.processor = ActiveSupport::OrderedOptions.new.tap do |pc|
     # max threads count (per worker process)
     pc.threads_count = 4
     # maximum processing time of the batch, after which the batch will be considered hung and processing will be aborted
@@ -236,6 +236,7 @@ default: &default
       owner: my_outbox_item_team # optional, used in Yabeda metrics
       retention: P1W # retention period, https://en.wikipedia.org/wiki/ISO_8601#Durations
       max_retries: 3 # default 0, the number of retries before the item will be marked as failed
+      strict_order: false # optional, default
       transports: # transports section
         produce_message: # underscored transport class name
           # transport reserved options
@@ -255,6 +256,10 @@ production:
   <<: *default
   bucket_size: 256
 ```
+__CAUTION__:
+- ⚠️ If this option is enabled and an error occurs while processing a message in a bucket, 
+subsequent messages in that bucket won't be processed until the current message is either skipped or successfully processed
+- ⚠️ Cannot use `retry_strategies` and the `strict_order` option at the same time
 
 ```ruby
 # app/services/import_order.rb

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/app/models/sbmt/outbox/base_item.rb

@@ -6,7 +6,7 @@ module Sbmt
       self.abstract_class = true
 
       class << self
-        delegate :owner, to: :config
+        delegate :owner, :strict_order, to: :config
 
         def box_type
           raise NotImplementedError
@@ -134,6 +134,7 @@ module Sbmt
       end
 
       def max_retries_exceeded?
+        return false if config.strict_order
         return true unless retriable?
 
         errors_count > config.max_retries

data/app/models/sbmt/outbox/base_item_config.rb

@@ -16,7 +16,7 @@ module Sbmt
       end
 
       def owner
-        return @owner if defined? @owner
+        return @owner if defined?(@owner)
 
         @owner = options[:owner].presence || yaml_config[:owner].presence
       end
@@ -57,7 +57,14 @@ module Sbmt
         return @retry_strategies if defined?(@retry_strategies)
 
         configured_strategies = options[:retry_strategies]
-        strategies = configured_strategies.presence || %w[exponential_backoff latest_available]
+
+        raise ConfigError, "You cannot use retry_strategies and the strict_order option at the same time." if strict_order.present? && configured_strategies.present?
+
+        strategies = if strict_order.present? && configured_strategies.nil?
+          []
+        else
+          configured_strategies.presence || %w[exponential_backoff latest_available]
+        end
 
         @retry_strategies ||= Array.wrap(strategies).map do |str_name|
           "Sbmt::Outbox::RetryStrategies::#{str_name.camelize}".constantize
@@ -108,6 +115,12 @@ module Sbmt
         end
       end
 
+      def strict_order
+        return @strict_order if defined?(@strict_order)
+
+        @strict_order = options[:strict_order].presence
+      end
+
       private
 
       attr_accessor :box_id, :box_name

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/v2/processor.rb

@@ -68,15 +68,18 @@ module Sbmt
         def process(task)
           lock_timer = Cutoff.new(lock_timeout)
           last_id = 0
+          strict_order = task.item_class.config.strict_order
 
           box_worker.item_execution_runtime.measure(task.yabeda_labels) do
             Outbox.database_switcher.use_master do
               task.ids.each do |id|
-                ProcessItem.call(task.item_class, id, worker_version: task.yabeda_labels[:worker_version])
+                result = ProcessItem.call(task.item_class, id, worker_version: task.yabeda_labels[:worker_version])
 
                 box_worker.job_items_counter.increment(task.yabeda_labels)
                 last_id = id
                 lock_timer.checkpoint!
+
+                break if strict_order == true && result.failure?
               end
             end
           end

data/lib/sbmt/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module Outbox
-    VERSION = "6.4.3"
+    VERSION = "6.6.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.6.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-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool