search-engine-for-typesense 30.1.6.7 → 30.1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17890bf666142ee9e0cd293c1ea5fc13dcf4089c50bb1e721708b7c9972f5e15
-  data.tar.gz: 84866d6a6d238f29e3eda054f445a88780c98ab9eff75673f6930c044a336a02
+  metadata.gz: ed93c9aa019a0f633ad5c7cc47ec08ea303f5e51491cfc3130e677271b000e1f
+  data.tar.gz: 6446746c790fc6b1c0fa084a5ba9bebd555f5e298738f7b8800fd2717257659f
 SHA512:
-  metadata.gz: 01aa100a2d5a612c56a85cd6f4e02d232476911ceea18cd7f024904a477874ab492d675d0ad9624212a4891e15e0a17371cc2c9314b38bb2bcb332e36212faba
-  data.tar.gz: fb6ba4067d04afdb1cc0bc2236c0040832fc6632d8cd0320080c77b7b9b6fa8d9b8ce6dca99ab725757ca4124107f67570ad2281e03404193c746258becef127
+  metadata.gz: 99aa8f0be6a9b43d0de16e402fe22cb60614861c73f26f122f0c155e3d35de33053a7822170c440bb407bcac73d7a5ba42f57ba0eda825a49fa210e369ba7ea3
+  data.tar.gz: a6526cc8752cdc5a8f61c03a55519e5cf18da1ac538e1028a881b8e5a2d147d5c44cb26b3f4fbbb46907589985564baa895166320b3c1eee230d6557f1890976

data/lib/search_engine/base/index_maintenance/lifecycle.rb

@@ -133,22 +133,37 @@ module SearchEngine
             result = nil
             step = SearchEngine::Logging::StepLine.new('Indexing')
             if applied && indexed_inside_apply
-              step.skip('performed during schema apply')
               result = indexed_inside_apply if indexed_inside_apply.is_a?(Hash)
+              if __se_result_status(result) == :ok
+                step.skip('performed during schema apply')
+              else
+                __se_finish_indexation_step(step, result)
+              end
             else
               step.update('indexing')
               step.yield_line!
               result = __se_index_partitions!(into: nil)
-              step.finish('done')
+              __se_finish_indexation_step(step, result)
             end
 
-            cascade_ok = result.is_a?(Hash) ? result[:status] == :ok : false
-            __se_cascade_after_indexation!(context: :full) if cascade_ok
+            __se_cascade_after_indexation!(context: :full) if __se_result_status(result) == :ok
             result
           ensure
             step&.close
           end
 
+          def __se_result_status(result)
+            result.is_a?(Hash) ? result[:status] : :ok
+          end
+
+          def __se_finish_indexation_step(step, result)
+            case __se_result_status(result)
+            when :ok      then step.finish('done')
+            when :partial then step.finish_warn('partial')
+            else               step.finish_warn('failed')
+            end
+          end
+
           def __se_full_retention(applied, logical, client)
             step = SearchEngine::Logging::StepLine.new('Retention')
             if applied

data/lib/search_engine/base/index_maintenance.rb

@@ -373,7 +373,15 @@ module SearchEngine
             warn("\n  Interrupted \u2014 stopping parallel partition workers\u2026")
           end
 
-          SearchEngine::InterruptiblePool.run(pool, on_interrupt: on_interrupt) do
+          pool_timeout = begin
+            SearchEngine.config.indexer.pool_timeout
+          rescue StandardError
+            nil
+          end
+
+          pool_status = SearchEngine::InterruptiblePool.run(
+            pool, on_interrupt: on_interrupt, timeout: pool_timeout
+          ) do
             parts.each_with_index do |part, idx|
               break if cancelled.true?
 
@@ -400,6 +408,8 @@ module SearchEngine
             end
           end
 
+          __se_flag_incomplete_slots!(renderer, parts, partition_errors, mtx, pool_timeout) if pool_status == :timed_out
+
           begin
             renderer.stop
           rescue StandardError
@@ -442,7 +452,33 @@ module SearchEngine
           nil
         end
 
-        private :__se_per_partition_docs_estimates, :__se_heuristic_docs_estimate
+        # Flag renderer slots that are still pending/in-progress after the pool
+        # timed out. Marks each as errored and appends to partition_errors so the
+        # caller raises and reports failure.
+        #
+        # @param renderer [SearchEngine::Logging::LiveRenderer]
+        # @param parts [Array] partition keys
+        # @param partition_errors [Array<StandardError>]
+        # @param mtx [Mutex]
+        # @param pool_timeout [Integer, nil] resolved timeout (seconds) from caller
+        # @return [void]
+        def __se_flag_incomplete_slots!(renderer, parts, partition_errors, mtx, pool_timeout)
+          effective_timeout = pool_timeout || SearchEngine::InterruptiblePool::GRACEFUL_TIMEOUT
+
+          parts.each_index do |idx|
+            slot = renderer[idx]
+            next if %i[done error].include?(slot.state)
+
+            error = SearchEngine::Errors::PartitionTimeout.new(
+              "partition #{parts[idx].inspect} was not processed — " \
+              "parallel pool timed out after #{effective_timeout}s"
+            )
+            slot.finish_error(error)
+            mtx.synchronize { partition_errors << error }
+          end
+        end
+
+        private :__se_per_partition_docs_estimates, :__se_heuristic_docs_estimate, :__se_flag_incomplete_slots!
       end
 
       class_methods do

data/lib/search_engine/config.rb

@@ -105,6 +105,9 @@ module SearchEngine
       attr_accessor :queue_name
       # @return [Boolean] whether to run model.count for progress bar estimates (default true)
       attr_accessor :estimate_progress
+      # @return [Integer, nil] graceful-shutdown timeout (seconds) for the parallel
+      #   partition pool. When nil, falls back to InterruptiblePool::GRACEFUL_TIMEOUT (3600s).
+      attr_accessor :pool_timeout
 
       def initialize
         @batch_size = 2000
@@ -114,6 +117,7 @@ module SearchEngine
         @dispatch = active_job_available? ? :active_job : :inline
         @queue_name = 'search_index'
         @estimate_progress = true
+        @pool_timeout = nil
       end
 
       private

data/lib/search_engine/errors.rb

@@ -120,6 +120,13 @@ module SearchEngine
     # the underlying HTTP client used by the official Typesense gem.
     class Timeout < Error; end
 
+    # Raised when one or more partitions were not processed because the
+    # parallel pool's graceful-shutdown timeout was exceeded.
+    #
+    # The pool kills remaining queued/running tasks after the timeout,
+    # leaving those partitions unindexed.
+    class PartitionTimeout < Error; end
+
     # Raised for network-level connectivity issues prior to receiving a response.
     #
     # Examples: DNS resolution failures, refused TCP connections, TLS handshake

data/lib/search_engine/interruptible_pool.rb

@@ -11,19 +11,28 @@ module SearchEngine
 
     # Execute a block that posts work to a thread pool, then wait for completion.
     #
-    # Normal path: graceful shutdown → long wait.
+    # Normal path: graceful shutdown → long wait → :ok.
+    # Timeout:     graceful wait expires → pool.kill → :timed_out.
     # Interrupt:   on_interrupt callback → pool.kill → short wait → re-raise.
     # Other error: ensure kill → short wait.
     #
     # @param pool [Concurrent::FixedThreadPool]
     # @param on_interrupt [Proc, nil] callback invoked before killing the pool
+    # @param timeout [Integer, nil] override for graceful-shutdown timeout (seconds);
+    #   defaults to {GRACEFUL_TIMEOUT} when nil
     # @yield block that posts work to the pool
-    # @return [void]
-    def self.run(pool, on_interrupt: nil)
+    # @return [Symbol] :ok on clean completion, :timed_out when the graceful timeout was exceeded
+    def self.run(pool, on_interrupt: nil, timeout: nil)
       yield
       pool.shutdown
-      pool.wait_for_termination(GRACEFUL_TIMEOUT) || pool.kill
-      pool.wait_for_termination(CLEANUP_TIMEOUT)
+      effective_timeout = timeout || GRACEFUL_TIMEOUT
+      completed = pool.wait_for_termination(effective_timeout)
+      unless completed
+        pool.kill
+        pool.wait_for_termination(CLEANUP_TIMEOUT)
+        return :timed_out
+      end
+      :ok
     rescue Interrupt
       on_interrupt&.call
       pool.kill

data/lib/search_engine/version.rb

@@ -3,5 +3,5 @@
 module SearchEngine
   # Current gem version.
   # @return [String]
-  VERSION = '30.1.6.7'
+  VERSION = '30.1.6.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search-engine-for-typesense
 version: !ruby/object:Gem::Version
-  version: 30.1.6.7
+  version: 30.1.6.8
 platform: ruby
 authors:
 - Nikita Shkoda