ruby_event_store-outbox 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e02fae40b268652d0187bfff203ea94993204069992b05d71808a3a820b28b
-  data.tar.gz: c78fdc01af8ca386f23babbcc409535e4c983238af4a13e3541d32f8b30b7f96
+  metadata.gz: a4c373da7338563c51f8bc7d3bae7e56ceb99f9b75d8104196d003f5316cdb6a
+  data.tar.gz: fbb6dad9bdaee2fea028a2cea8541eb6a9f964e1d10d4e704ebe3f715a88d623
 SHA512:
-  metadata.gz: cca7886a64c64912770e4415ec65523309c6af0ef5edbc0c3d5a55fd2e7937be36517104d0539a1436e006af5623f82d0f7be09e79f2b78604fd257c85d8c0ed
-  data.tar.gz: d8435157be3745483024b2ddbc867502a0a340a10846485b35ac204eba845b5e05da924f24771b9b8e697b911c9c3eb605c5d7129c4fe8c9e0d66ca04138e6eb
+  metadata.gz: e6f7ac3498d139a98ef14b8cbb7abe7bd4af8b794b41f90c6b65150523410a25a59ff6e863301d87f3a90bb5be80cc422d7ae94dd8a16fedd3b88a1db334eee0
+  data.tar.gz: 1c30a1e0c60bee39d1064e0aa7c535416a3cca7d4aa25328ab684741bf4a6bc65373e412388e65d5e57183a4dbf25e4fff385c456cd562c1afc2fe9e04e1d5d8

data/lib/generators/ruby_event_store/outbox/templates/create_event_store_outbox_template.rb

@@ -11,5 +11,13 @@ class CreateEventStoreOutbox < ActiveRecord::Migration<%= migration_version %>
     end
     add_index :event_store_outbox, [:format, :enqueued_at, :split_key], name: "index_event_store_outbox_for_pool"
     add_index :event_store_outbox, [:created_at, :enqueued_at], name: "index_event_store_outbox_for_clear"
+
+    create_table(:event_store_outbox_locks, force: false) do |t|
+      t.string :format, null: false
+      t.string :split_key, null: false
+      t.datetime :locked_at, null: true
+      t.string :locked_by, null: true, limit: 36
+    end
+    add_index :event_store_outbox_locks, [:format, :split_key], name: "index_event_store_outbox_locks_for_locking", unique: true
   end
 end

data/lib/ruby_event_store/outbox.rb

@@ -5,6 +5,7 @@ module RubyEventStore
   end
 end
 
+require_relative 'outbox/fetch_specification'
 require_relative 'outbox/record'
 require_relative 'outbox/sidekiq_scheduler'
 require_relative 'outbox/consumer'

data/lib/ruby_event_store/outbox/cli.rb

@@ -59,7 +59,8 @@ module RubyEventStore
       end
 
       def build_consumer(options)
-        logger = Logger.new(STDOUT, level: options.log_level, progname: "RES-Outbox")
+        consumer_uuid = SecureRandom.uuid
+        logger = Logger.new(STDOUT, level: options.log_level, progname: "RES-Outbox #{consumer_uuid}")
         consumer_configuration = Consumer::Configuration.new(
           split_keys: options.split_keys,
           message_format: options.message_format,
@@ -69,6 +70,7 @@ module RubyEventStore
         )
         metrics = Metrics.from_url(options.metrics_url)
         outbox_consumer = RubyEventStore::Outbox::Consumer.new(
+          consumer_uuid,
           options,
           logger: logger,
           metrics: metrics,

data/lib/ruby_event_store/outbox/consumer.rb

@@ -3,11 +3,14 @@ require "redis"
 require "active_record"
 require "ruby_event_store/outbox/record"
 require "ruby_event_store/outbox/sidekiq5_format"
+require "ruby_event_store/outbox/sidekiq_processor"
+require "ruby_event_store/outbox/fetch_specification"
 
 module RubyEventStore
   module Outbox
     class Consumer
-      SLEEP_TIME_WHEN_NOTHING_TO_DO = 0.1
+      SLEEP_TIME_WHEN_NOTHING_TO_DO = 0.5
+      MAXIMUM_BATCH_FETCHES_IN_ONE_LOCK = 10
 
       class Configuration
         def initialize(
@@ -38,28 +41,26 @@ module RubyEventStore
         attr_reader :split_keys, :message_format, :batch_size, :database_url, :redis_url
       end
 
-      def initialize(configuration, clock: Time, logger:, metrics:)
+      def initialize(consumer_uuid, configuration, clock: Time, logger:, metrics:)
         @split_keys = configuration.split_keys
         @clock = clock
-        @redis = Redis.new(url: configuration.redis_url)
         @logger = logger
         @metrics = metrics
         @batch_size = configuration.batch_size
+        @consumer_uuid = consumer_uuid
         ActiveRecord::Base.establish_connection(configuration.database_url) unless ActiveRecord::Base.connected?
         if ActiveRecord::Base.connection.adapter_name == "Mysql2"
-          ActiveRecord::Base.connection.execute("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;")
           ActiveRecord::Base.connection.execute("SET SESSION innodb_lock_wait_timeout = 1;")
         end
 
         raise "Unknown format" if configuration.message_format != SIDEKIQ5_FORMAT
-        @message_format = SIDEKIQ5_FORMAT
+        @processor = SidekiqProcessor.new(Redis.new(url: configuration.redis_url))
 
         @gracefully_shutting_down = false
         prepare_traps
       end
 
       def init
-        @redis.sadd("queues", split_keys)
         logger.info("Initiated RubyEventStore::Outbox v#{VERSION}")
         logger.info("Handling split keys: #{split_keys ? split_keys.join(", ") : "(all of them)"}")
       end
@@ -76,62 +77,129 @@ module RubyEventStore
       end
 
       def one_loop
-        Record.transaction do
-          records_scope = Record.lock.where(format: message_format, enqueued_at: nil)
-          records_scope = records_scope.where(split_key: split_keys) if !split_keys.nil?
-          records = records_scope.order("id ASC").limit(batch_size).to_a
-          if records.empty?
-            metrics.write_point_queue(status: "ok")
-            return false
+        remaining_split_keys = @split_keys.dup
+
+        was_something_changed = false
+        while (split_key = remaining_split_keys.shift)
+          was_something_changed |= handle_split(FetchSpecification.new(processor.message_format, split_key))
+        end
+        was_something_changed
+      end
+
+      def handle_split(fetch_specification)
+        obtained_lock = obtain_lock_for_process(fetch_specification)
+        return false unless obtained_lock
+
+        something_processed = false
+
+        MAXIMUM_BATCH_FETCHES_IN_ONE_LOCK.times do
+          batch = retrieve_batch(fetch_specification)
+          if batch.empty?
+            break
           end
 
-          now = @clock.now.utc
           failed_record_ids = []
-          records.group_by(&:split_key).each do |split_key, records2|
+          updated_record_ids = []
+          batch.each do |record|
             begin
-              failed = handle_group_of_records(now, split_key, records2)
-              failed_record_ids.concat(failed.map(&:id))
+              now = @clock.now.utc
+              processor.process(record, now)
+
+              record.update_column(:enqueued_at, now)
+              something_processed |= true
+              updated_record_ids << record.id
             rescue => e
-              failed_record_ids.concat(records2.map(&:id))
+              failed_record_ids << record.id
               e.full_message.split($/).each {|line| logger.error(line) }
             end
           end
 
-          updated_record_ids = records.map(&:id) - failed_record_ids
-          Record.where(id: updated_record_ids).update_all(enqueued_at: now)
-          metrics.write_point_queue(status: "ok", enqueued: updated_record_ids.size, failed: failed_record_ids.size)
+          metrics.write_point_queue(
+            enqueued: updated_record_ids.size,
+            failed: failed_record_ids.size,
+            format: fetch_specification.message_format,
+            split_key: fetch_specification.split_key,
+            remaining: get_remaining_count(fetch_specification)
+          )
 
           logger.info "Sent #{updated_record_ids.size} messages from outbox table"
-          true
+
+          obtained_lock = refresh_lock_for_process(obtained_lock)
+          break unless obtained_lock
         end
-      rescue ActiveRecord::Deadlocked
-        logger.warn "Outbox fetch deadlocked"
-        metrics.write_point_queue(status: "deadlocked")
-        false
-      rescue ActiveRecord::LockWaitTimeout
-        logger.warn "Outbox fetch lock timeout"
-        metrics.write_point_queue(status: "lock_timeout")
-        false
+
+        metrics.write_point_queue(
+          format: fetch_specification.message_format,
+          split_key: fetch_specification.split_key,
+          remaining: get_remaining_count(fetch_specification)
+        ) unless something_processed
+
+        release_lock_for_process(fetch_specification)
+
+        processor.after_batch
+
+        something_processed
       end
 
       private
-      attr_reader :split_keys, :logger, :message_format, :batch_size, :metrics
-
-      def handle_group_of_records(now, split_key, records)
-        failed = []
-        elements = []
-        records.each do |record|
-          begin
-            elements << JSON.generate(JSON.parse(record.payload).merge({
-              "enqueued_at" => now.to_f,
-            }))
-          rescue => e
-            failed << record
-            e.full_message.split($/).each {|line| logger.error(line) }
-          end
+      attr_reader :split_keys, :logger, :batch_size, :metrics, :processor, :consumer_uuid
+
+      def obtain_lock_for_process(fetch_specification)
+        result = Lock.obtain(fetch_specification, consumer_uuid, clock: @clock)
+        case result
+        when :deadlocked
+          logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
+          metrics.write_operation_result("obtain", "deadlocked")
+          return false
+        when :lock_timeout
+          logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
+          metrics.write_operation_result("obtain", "lock_timeout")
+          return false
+        when :taken
+          logger.debug "Obtaining lock for split_key '#{fetch_specification.split_key}' unsuccessful (taken)"
+          metrics.write_operation_result("obtain", "taken")
+          return false
+        else
+          return result
+        end
+      end
+
+      def release_lock_for_process(fetch_specification)
+        result = Lock.release(fetch_specification, consumer_uuid)
+        case result
+        when :ok
+        when :deadlocked
+          logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
+          metrics.write_operation_result("release", "deadlocked")
+        when :lock_timeout
+          logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
+          metrics.write_operation_result("release", "lock_timeout")
+        when :not_taken_by_this_process
+          logger.debug "Releasing lock for split_key '#{fetch_specification.split_key}' failed (not taken by this process)"
+          metrics.write_operation_result("release", "not_taken_by_this_process")
+        else
+          raise "Unexpected result #{result}"
+        end
+      end
+
+      def refresh_lock_for_process(lock)
+        result = lock.refresh(clock: @clock)
+        case result
+        when :deadlocked
+          logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (deadlock)"
+          metrics.write_operation_result("refresh", "deadlocked")
+          return false
+        when :lock_timeout
+          logger.warn "Refreshing lock for split_key '#{lock.split_key}' failed (lock timeout)"
+          metrics.write_operation_result("refresh", "lock_timeout")
+          return false
+        when :stolen
+          logger.debug "Refreshing lock for split_key '#{lock.split_key}' unsuccessful (stolen)"
+          metrics.write_operation_result("refresh", "stolen")
+          return false
+        else
+          return result
         end
-        @redis.lpush("queue:#{split_key}", elements)
-        failed
       end
 
       def prepare_traps
@@ -146,6 +214,14 @@ module RubyEventStore
       def initiate_graceful_shutdown
         @gracefully_shutting_down = true
       end
+
+      def retrieve_batch(fetch_specification)
+        Record.remaining_for(fetch_specification).order("id ASC").limit(batch_size).to_a
+      end
+
+      def get_remaining_count(fetch_specification)
+        Record.remaining_for(fetch_specification).count
+      end
     end
   end
 end

data/lib/ruby_event_store/outbox/consumer_process.rb

@@ -0,0 +1,6 @@
+module RubyEventStore
+  module Outbox
+    class ConsumerProcess
+    end
+  end
+end

data/lib/ruby_event_store/outbox/fetch_specification.rb

@@ -0,0 +1,13 @@
+module RubyEventStore
+  module Outbox
+    class FetchSpecification
+      def initialize(message_format, split_key)
+        @message_format = message_format
+        @split_key = split_key
+        freeze
+      end
+
+      attr_reader :message_format, :split_key
+    end
+  end
+end

data/lib/ruby_event_store/outbox/metrics/influx.rb

@@ -17,14 +17,28 @@ module RubyEventStore
           @influxdb_client = InfluxDB::Client.new(**options)
         end
 
-        def write_point_queue(status:, enqueued: 0, failed: 0)
+        def write_operation_result(operation, result)
+          write_point("ruby_event_store.outbox.lock", {
+            values: {
+              value: 1,
+            },
+            tags: {
+              operation: operation,
+              result: result,
+            }
+          })
+        end
+
+        def write_point_queue(enqueued: 0, failed: 0, remaining: 0, format: nil, split_key: nil)
           write_point("ruby_event_store.outbox.queue", {
             values: {
               enqueued: enqueued,
               failed: failed,
+              remaining: remaining,
             },
             tags: {
-              status: status,
+              format: format,
+              split_key: split_key,
             }
           })
         end

data/lib/ruby_event_store/outbox/metrics/null.rb

@@ -2,6 +2,9 @@ module RubyEventStore
   module Outbox
     module Metrics
       class Null
+        def write_operation_result(operation, result)
+        end
+
         def write_point_queue(**kwargs)
         end
       end

data/lib/ruby_event_store/outbox/record.rb

@@ -8,9 +8,96 @@ module RubyEventStore
       self.primary_key = :id
       self.table_name = 'event_store_outbox'
 
+      def self.remaining_for(fetch_specification)
+        where(format: fetch_specification.message_format, split_key: fetch_specification.split_key, enqueued_at: nil)
+      end
+
       def hash_payload
         JSON.parse(payload).deep_symbolize_keys
       end
+
+      def enqueued?
+        !enqueued_at.nil?
+      end
+    end
+
+    class Lock < ::ActiveRecord::Base
+      self.table_name = 'event_store_outbox_locks'
+
+      def self.obtain(fetch_specification, process_uuid, clock:)
+        l = nil
+        transaction do
+          l = get_lock_record(fetch_specification)
+
+          return :taken if l.recently_locked?
+
+          l.update!(
+            locked_by: process_uuid,
+            locked_at: clock.now,
+          )
+        end
+        l
+      rescue ActiveRecord::Deadlocked
+        :deadlocked
+      rescue ActiveRecord::LockWaitTimeout
+        :lock_timeout
+      end
+
+      def refresh(clock:)
+        transaction do
+          current_process_uuid = locked_by
+          lock!
+          if locked_by == current_process_uuid
+            update!(locked_at: clock.now)
+            return self
+          else
+            return :stolen
+          end
+        end
+      rescue ActiveRecord::Deadlocked
+        :deadlocked
+      rescue ActiveRecord::LockWaitTimeout
+        :lock_timeout
+      end
+
+      def self.release(fetch_specification, process_uuid)
+        transaction do
+          l = get_lock_record(fetch_specification)
+          return :not_taken_by_this_process if !l.locked_by?(process_uuid)
+
+          l.update!(locked_by: nil, locked_at: nil)
+        end
+        :ok
+      rescue ActiveRecord::Deadlocked
+        :deadlocked
+      rescue ActiveRecord::LockWaitTimeout
+        :lock_timeout
+      end
+
+      def locked_by?(process_uuid)
+        locked_by.eql?(process_uuid)
+      end
+
+      def recently_locked?
+        locked_by && locked_at > 10.minutes.ago
+      end
+
+      private
+      def self.lock_for_split_key(fetch_specification)
+        lock.find_by(format: fetch_specification.message_format, split_key: fetch_specification.split_key)
+      end
+
+      def self.get_lock_record(fetch_specification)
+        l = lock_for_split_key(fetch_specification)
+        if l.nil?
+          begin
+            l = create!(format: fetch_specification.message_format, split_key: fetch_specification.split_key)
+          rescue ActiveRecord::RecordNotUnique
+            l = lock_for_split_key(fetch_specification)
+          end
+        end
+        l
+      end
     end
   end
 end

data/lib/ruby_event_store/outbox/sidekiq_processor.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "ruby_event_store/outbox/sidekiq5_format"
+
+module RubyEventStore
+  module Outbox
+    class SidekiqProcessor
+      InvalidPayload = Class.new(StandardError)
+
+      def initialize(redis)
+        @redis = redis
+        @recently_used_queues = Set.new
+      end
+
+      def process(record, now)
+        parsed_record = JSON.parse(record.payload)
+
+        queue = parsed_record["queue"]
+        raise InvalidPayload.new("Missing queue") if queue.nil? || queue.empty?
+        payload = JSON.generate(parsed_record.merge({
+          "enqueued_at" => now.to_f,
+        }))
+
+        redis.lpush("queue:#{queue}", payload)
+
+        @recently_used_queues << queue
+      end
+
+      def after_batch
+        if !@recently_used_queues.empty?
+          redis.sadd("queues", @recently_used_queues.to_a)
+          @recently_used_queues.clear
+        end
+      end
+
+      def message_format
+        SIDEKIQ5_FORMAT
+      end
+
+      private
+      attr_reader :redis
+    end
+  end
+end

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'sidekiq'
+require "ruby_event_store/outbox/sidekiq5_format"
+
+module RubyEventStore
+  module Outbox
+    class SidekiqProducer
+      def call(klass, args)
+        sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
+        item = {
+          'class' => klass,
+          'args' => args,
+        }
+        normalized_item = sidekiq_client.__send__(:normalize_item, item)
+        payload = sidekiq_client.__send__(:process_single, normalized_item.fetch('class'), normalized_item)
+        if payload
+          Record.create!(
+            format: SIDEKIQ5_FORMAT,
+            split_key: payload.fetch('queue'),
+            payload: payload.to_json
+          )
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/outbox/sidekiq_scheduler.rb

@@ -1,31 +1,24 @@
 # frozen_string_literal: true
 
-require 'sidekiq'
-require "ruby_event_store/outbox/sidekiq5_format"
+require "ruby_event_store/outbox/sidekiq_producer"
 
 module RubyEventStore
   module Outbox
     class SidekiqScheduler
+      def initialize
+        @sidekiq_producer = SidekiqProducer.new
+      end
+
       def call(klass, serialized_event)
-        sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
-        item = {
-          'class' => klass,
-          'args' => [serialized_event.to_h],
-        }
-        normalized_item = sidekiq_client.__send__(:normalize_item, item)
-        payload = sidekiq_client.__send__(:process_single, normalized_item.fetch('class'), normalized_item)
-        if payload
-          Record.create!(
-            format: SIDEKIQ5_FORMAT,
-            split_key: payload.fetch('queue'),
-            payload: payload.to_json
-          )
-        end
+        sidekiq_producer.call(klass, [serialized_event.to_h])
       end
 
       def verify(subscriber)
         Class === subscriber && subscriber.respond_to?(:through_outbox?) && subscriber.through_outbox?
       end
+
+      private
+      attr_reader :sidekiq_producer
     end
   end
 end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.0.10"
+    VERSION = "0.0.15"
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.15
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -53,12 +53,16 @@ files:
 - lib/ruby_event_store/outbox.rb
 - lib/ruby_event_store/outbox/cli.rb
 - lib/ruby_event_store/outbox/consumer.rb
+- lib/ruby_event_store/outbox/consumer_process.rb
+- lib/ruby_event_store/outbox/fetch_specification.rb
 - lib/ruby_event_store/outbox/metrics.rb
 - lib/ruby_event_store/outbox/metrics/influx.rb
 - lib/ruby_event_store/outbox/metrics/null.rb
 - lib/ruby_event_store/outbox/record.rb
 - lib/ruby_event_store/outbox/sidekiq5_format.rb
 - lib/ruby_event_store/outbox/sidekiq_message_handler.rb
+- lib/ruby_event_store/outbox/sidekiq_processor.rb
+- lib/ruby_event_store/outbox/sidekiq_producer.rb
 - lib/ruby_event_store/outbox/sidekiq_scheduler.rb
 - lib/ruby_event_store/outbox/version.rb
 homepage: https://railseventstore.org