artery 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a24ddb4d77a16718ba5a3f736d54decefc74e698d2d5dad2564450845e4848c
-  data.tar.gz: eb438118c9b36740988e7c17d00a8c242b6bd836cbe0204a81bf923ed3ab42f5
+  metadata.gz: 6fc6ee867a6031d7ad94fa40630261f079c23664833cb79a40d7100445967d27
+  data.tar.gz: 38bc318bbc6d76c4ac86138c0fa60e2f61001cc9e869a36f2931243bac208780
 SHA512:
-  metadata.gz: fb73eef213f1316758158ff5282c854fcc9b1dd602281921933ecc3c8fa4c9d79f4a1a731a7f2e26581fff789425e8e7b0dd96a5bb82a00fd734e21415fc3b39
-  data.tar.gz: 9b62f659e797ab808df25ed4c719d94a9d0c0f3ef80d445f432fbe810bba6901d6c7cfe4fea4d58584de5f0d6d836919ee46b52cff7c2a559fb2d7ff4dbd4bef
+  metadata.gz: '09d04bc9c56091cb5f9092c882b9127e5362092ccee797cba608dc3dd59131277a283dc85a852bd5e1ff5bdebb6276c5f1c415417cfc1eb3679d854c8754b8d7'
+  data.tar.gz: dcd7b59c4288f0669aff6141b21e46aaaef2e7e5467b41d98d1d108a5f83729d6aea1bbe96c9e2d6c1cec501cd318cd59bd09c00c979234dfb8f598133118695

data/lib/artery/active_record/message.rb

@@ -20,7 +20,10 @@ module Artery
         end
 
         def latest_index(model)
-          where(model: model).maximum(:id).to_i
+          last_message_id = where(model: model).maximum(:id).to_i
+          return last_message_id unless last_message_id.zero?
+
+          Artery.model_info_class.last_published_id_for(model)
         end
 
         def delete_old

data/lib/artery/active_record/model_info.rb

@@ -31,6 +31,10 @@ module Artery
 
         row
       end
+
+      def self.last_published_id_for(model_name)
+        where(model: model_name).limit(1).pluck(:last_published_id).first.to_i
+      end
     end
   end
 end

data/lib/artery/model/subscriptions.rb

@@ -48,7 +48,22 @@ module Artery
           model  ||= artery_model_name
           action ||= '*'
 
-          artery_add_subscription Routing.uri(service: service, model: model, action: action), kwargs, &blk
+          artery_add_subscription Routing.uri(service: service, model: model, action: action), **kwargs, client: true,
+                                  &blk
+        end
+
+        def artery_rewind_message_counter!(service: nil) # rubocop:disable Naming/PredicateMethod
+          return false if artery_source_model?
+
+          subscriptions = artery[:subscriptions]&.select do |subscription|
+            next false unless subscription.rewindable?
+
+            service.nil? || subscription.uri.service.to_sym == service.to_sym
+          end
+          return false if subscriptions.blank?
+
+          subscriptions.each(&:rewind_message_counter!)
+          true
         end
 
         # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity

data/lib/artery/publisher.rb

@@ -4,7 +4,7 @@ require 'concurrent'
 
 module Artery
   class Publisher
-    DISCOVERY_INTERVAL = 5
+    DISCOVERY_INTERVAL = 30
     POLL_INTERVAL = 0.5
     BATCH_SIZE = 100
 
@@ -27,44 +27,64 @@ module Artery
         max_queue: 0,
         fallback_policy: :caller_runs
       )
-      @running_models = Concurrent::Set.new
+      @known_models = Concurrent::Set.new
+      @busy_models = Concurrent::Set.new
+      @last_discovery = Time.at(0)
 
       Instrumentation.instrument(:publisher, action: :started)
 
       loop do
-        models = Artery.model_info_class.pluck(:model)
+        discover_models if discovery_due?
 
-        models.each do |model|
-          next if @running_models.include?(model)
+        @known_models.each do |model|
+          next if @busy_models.include?(model)
 
-          @running_models.add(model)
-          @pool.post { model_loop(model) }
+          @busy_models.add(model)
+          @pool.post { process_model(model) }
         end
 
-        sleep DISCOVERY_INTERVAL
+        sleep POLL_INTERVAL
       end
     end
 
-    def model_loop(model)
-      Artery.logger.tagged('Publisher', model) do
+    def discover_models
+      current = Artery.model_info_class.pluck(:model)
+
+      (@known_models - current).each do |removed|
+        @known_models.delete(removed)
+        Instrumentation.instrument(:publisher, action: :model_removed, model: removed)
+      end
+
+      current.each do |model|
+        next if @known_models.include?(model)
+
+        @known_models.add(model)
         Artery.model_info_class.ensure_initialized!(model)
         Instrumentation.instrument(:publisher, action: :model_started, model: model)
+      end
 
+      @last_discovery = Time.now
+    end
+
+    def discovery_due?
+      Time.now - @last_discovery >= DISCOVERY_INTERVAL
+    end
+
+    def process_model(model)
+      Artery.logger.tagged('Publisher', model) do
         loop do
           published = publish_batch(model)
-          sleep POLL_INTERVAL if published < BATCH_SIZE
+          break if published < BATCH_SIZE
         end
-      rescue StandardError => e
-        Instrumentation.instrument(:publisher, action: :error, model: model, error: e.message)
-        Artery.handle_error Error.new(
-          "Publisher error for #{model}: #{e.message}",
-          original_exception: e
-        )
-        sleep POLL_INTERVAL
-        retry
       end
+    rescue StandardError => e
+      Instrumentation.instrument(:publisher, action: :error, model: model, error: e.message)
+      Artery.handle_error Error.new(
+        "Publisher error for #{model}: #{e.message}",
+        original_exception: e
+      )
     ensure
-      @running_models.delete(model)
+      @busy_models&.delete(model)
     end
 
     def publish_batch(model)

data/lib/artery/subscription/synchronization.rb

@@ -97,8 +97,54 @@ module Artery
         end
       end
 
+      def rewind_message_counter! # rubocop:disable Naming/PredicateMethod
+        return false unless rewindable?
+
+        local_index = latest_message_index
+        return false unless local_index.positive?
+
+        remote_index = request_publisher_latest_index!
+        return false unless remote_index.positive?
+        return false if remote_index >= local_index
+
+        Artery.logger.info(
+          "Rewinding #{uri} latest_index from #{local_index} to #{remote_index}"
+        )
+        info.update!(latest_index: remote_index)
+        true
+      end
+
       private
 
+      def request_publisher_latest_index!
+        route = Routing.uri(
+          service: uri.service,
+          model: uri.model,
+          plural: true,
+          action: :get_all
+        ).to_route
+
+        remote_index = nil
+
+        Artery.request(
+          route,
+          representation: representation_name,
+          scope: synchronize_updates_scope,
+          page: 0,
+          per_page: 1
+        ) do |on|
+          on.success do |data|
+            remote_index = data[:_index].to_i
+          end
+
+          on.error do |error|
+            raise Error, "Failed to fetch artery index for #{uri}: #{error.message}"
+          end
+        end
+
+        remote_index.to_i
+      end
+
       def run_synchronization_heartbeat
         return if @heartbeat_thread
 

data/lib/artery/subscription.rb

@@ -28,6 +28,11 @@ module Artery
       @info ||= Artery.subscription_info_class.find_for_subscription(self)
     end
 
+    def reset_info!
+      @info = nil
+      self
+    end
+
     def representation_name
       options[:representation]
     end
@@ -40,6 +45,14 @@ module Artery
       @subscriber.artery[:source]
     end
 
+    def client?
+      options[:client]
+    end
+
+    def rewindable?
+      client? && synchronize_updates?
+    end
+
     def latest_outgoing_message_index
       return unless source?
 

data/lib/artery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Artery
-  VERSION = '1.4.1'
+  VERSION = '1.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artery
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Sergey Gnuskov