chewy 8.3.0 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d773f10bf67d60eca51ff91a6d668186eea74515bb5b31a5fd5ce814dac3c7
-  data.tar.gz: 334c6e92185369170b9f4d534029b69c218bb3c0cabfe6e4c11fd79268c19587
+  metadata.gz: bbef8e814a251ebcf189865c37c82476a8e3397983c4ede20694df87a7a61bd9
+  data.tar.gz: e673c1ab4ae490dd3ae716bcb3e617a0661f87c3f43143f59237a46228777375
 SHA512:
-  metadata.gz: 24bde735bcfc4f1bfec8b146cdcc5024d049e1405ccfbbae5e6f57f53a89aa9a6951063b00251a2f87fafac3632e1640fddc64038c7337e9147a0b9d6740f984
-  data.tar.gz: d2d84b1d2d3b07bde52699dfc54ed3b9ac8b9b71c5d79ca204851abab06bf53a41f0591ded6cdab59be5bf87522374dc10ff01d180891bcf81d73d33b009e180
+  metadata.gz: '04927525ee47f4f5591ed3f826d2477a87f267be465b739070c82cf1c54d558fe77d56bc88868d35be5fa6c27c8a0302ac31b6fd1f7c79c18b0759eb3e14eabf'
+  data.tar.gz: 62c30c3643ed78e661409929e5a075f02cbac789978f84d0a89531e00ab90764782dc085a7a44243b53b5613466794baa4b881eb22c55abdbde7b46bbb583966

data/CHANGELOG.md

@@ -8,6 +8,28 @@
 
 ### Changes
 
+## 8.4.0 (2026-06-17)
+
+### New Features
+
+* [#1036](https://github.com/toptal/chewy/issues/1036): Add `Chewy.close_client` and `Chewy::ElasticClient#close` to explicitly close connections to Elasticsearch, avoiding file descriptor leaks in long-lived multi-threaded processes (e.g. Sidekiq). ([@AlfonsoUceda][])
+
+### Bug Fixes
+
+* ([#1034](https://github.com/toptal/chewy/issues/1034)): Fixed `delayed_sidekiq` strategy raising `TypeError: Unsupported command argument type: Array` on Sidekiq 7+. The LUA scripts now run via `EVALSHA` through a portable helper instead of redis-rb's keyword `eval`, which the redis-client-backed client Sidekiq 7+ yields does not support. ([@AlfonsoUceda][])
+
+### Changes
+
+## 8.3.1 (2026-06-05)
+
+### New Features
+
+### Bug Fixes
+
+* [#1037](https://github.com/toptal/chewy/pull/1037): `#scroll_batches` now clears the scroll context opened for an empty result. The `_scroll_id` was only captured while iterating batches, so a zero-hit scope (which still opens a context on the initial request) leaked it until the scroll keepalive expired, contributing to `search.max_open_scroll_context` exhaustion.
+
+### Changes
+
 ## 8.3.0 (2026-06-03)
 
 ### New Features
@@ -888,6 +910,7 @@
 [@AgeevAndrew]: https://github.com/AgeevAndrew
 [@aglushkov]: https://github.com/aglushkov
 [@AlexVPopov]: https://github.com/AlexVPopov
+[@AlfonsoUceda]: https://github.com/AlfonsoUceda
 [@AndreySavelyev]: https://github.com/AndreySavelyev
 [@afg419]: https://github.com/afg419
 [@arion]: https://github.com/arion

data/README.md

@@ -133,6 +133,23 @@ development:
       ca_file: './tmp/http_ca.crt'
 ```
 
+### Closing connections
+
+`Chewy.client` is memoized per thread, so every thread that touches Chewy gets
+its own client with its own connections to Elasticsearch. Neither
+`elasticsearch-ruby` nor `elastic-transport` expose a public way to close those
+connections, so they are only released when Ruby's garbage collector reclaims
+the client. In long-lived, multi-threaded processes that frequently spawn and
+discard threads (e.g. Sidekiq, which replaces a thread on job failure), this can
+leak file descriptors.
+
+Use `Chewy.close_client` to close the current thread's connections and drop its
+client. The next `Chewy.client` call rebuilds a fresh one:
+
+```ruby
+Chewy.close_client
+```
+
 ### Index
 
 Create `app/chewy/users_index.rb` with User Index:

data/lib/chewy/elastic_client.rb

@@ -12,6 +12,21 @@ module Chewy
       @elastic_client = elastic_client
     end
 
+    # Closes the underlying connections to Elasticsearch.
+    #
+    # Neither elasticsearch-ruby nor elastic-transport expose a public method
+    # to close connections, so they are only released when Ruby's garbage
+    # collector reclaims the client instance. This reaches down to the Faraday
+    # connection of every transport connection and closes it explicitly, which
+    # is useful to avoid file descriptor leaks in long-lived processes that
+    # build a client per thread (e.g. Sidekiq workers).
+    def close
+      @elastic_client.transport.connections.each do |connection|
+        faraday = connection.connection
+        faraday.close if faraday.respond_to?(:close)
+      end
+    end
+
   private
 
     def method_missing(name, *args, **kwargs, &block)

data/lib/chewy/index/import/bulk_builder.rb

@@ -47,7 +47,7 @@ module Chewy
         end
 
         def index_entry(object)
-          return [] if @fields&.empty?
+          return [] if @fields && @fields.empty?
 
           entry = {}
           entry[:_id] = index_object_ids[object] if index_object_ids[object]

data/lib/chewy/search/scrolling.rb

@@ -35,7 +35,7 @@ module Chewy
 
         total_batches += 1 if last_batch_size != 0
 
-        scroll_id = nil
+        scroll_id = result['_scroll_id']
 
         total_batches.times do |batch_counter|
           last_run = total_batches - 1 == batch_counter

data/lib/chewy/strategy/delayed_sidekiq/redis_script.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Chewy
+  class Strategy
+    class DelayedSidekiq
+      # Runs a LUA script through whatever client `Sidekiq.redis` yields.
+      #
+      # redis-rb (Sidekiq <= 6) accepts `eval(script, keys:, argv:)`, but the
+      # real Sidekiq 7+ runtime yields a redis-client-backed CompatClient that
+      # has no `#eval` and forwards the keyword args as a nested array, raising
+      # `TypeError: Unsupported command argument type: Array` (issue #971).
+      #
+      # `evalsha(sha, keys_array, argv_array)` is the one form both clients
+      # expand to the flat `EVALSHA sha numkeys *keys *argv` shape, so we load
+      # the script once and call it by digest, reloading on NOSCRIPT.
+      module RedisScript
+        def self.call(redis, script, keys:, argv:)
+          reloaded = false
+          begin
+            shas[script] ||= redis.script(:load, script)
+            redis.evalsha(shas[script], keys, argv)
+          rescue StandardError => e
+            raise if reloaded || !e.message.to_s.include?('NOSCRIPT')
+
+            reloaded = true
+            shas.delete(script) # flushed cache or failover: reload and retry once
+            retry
+          end
+        end
+
+        def self.shas
+          @shas ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/chewy/strategy/delayed_sidekiq/scheduler.rb

@@ -10,6 +10,7 @@ require_relative '../../index'
 module Chewy
   class Strategy
     class DelayedSidekiq
+      require_relative 'redis_script'
       require_relative 'worker'
 
       LUA_SCRIPT = <<~LUA
@@ -98,7 +99,7 @@ module Chewy
         def postpone
           ::Sidekiq.redis do |redis|
             # do the redis stuff in a single command to avoid concurrency issues
-            if redis.eval(LUA_SCRIPT, keys: [timechunk_key, timechunks_key], argv: [serialize_data, at, ttl])
+            if RedisScript.call(redis, LUA_SCRIPT, keys: [timechunk_key, timechunks_key], argv: [serialize_data, at, ttl])
               ::Sidekiq::Client.push(
                 'queue' => sidekiq_queue,
                 'at' => at + margin,

data/lib/chewy/strategy/delayed_sidekiq/worker.rb

@@ -39,7 +39,7 @@ module Chewy
           options[:refresh] = !Chewy.disable_refresh_async if Chewy.disable_refresh_async
 
           ::Sidekiq.redis do |redis|
-            members = redis.eval(LUA_SCRIPT, keys: [], argv: [type, score, Scheduler::KEY_PREFIX])
+            members = RedisScript.call(redis, LUA_SCRIPT, keys: [], argv: [type, score, Scheduler::KEY_PREFIX])
 
             # extract ids and fields & do the reset of records
             ids, fields = extract_ids_and_fields(members)

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '8.3.0'.freeze
+  VERSION = '8.4.0'.freeze
 end

data/lib/chewy.rb

@@ -102,6 +102,21 @@ module Chewy
       Chewy.current[:chewy_client] ||= Chewy::ElasticClient.new
     end
 
+    # Closes the current thread's client connections to Elasticsearch and
+    # drops the thread-local client, so the next `Chewy.client` call builds a
+    # fresh one.
+    #
+    # Useful in long-lived multi-threaded processes (e.g. Sidekiq) where the
+    # per-thread client would otherwise keep its connections open until the
+    # dead thread is garbage collected, leaking file descriptors.
+    def close_client
+      client = Chewy.current[:chewy_client]
+      return unless client
+
+      client.close
+      Chewy.current[:chewy_client] = nil
+    end
+
     # Sends wait_for_status request to ElasticSearch with status
     # defined in configuration.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.4.0
 platform: ruby
 authors:
 - Toptal, LLC
@@ -174,6 +174,7 @@ files:
 - lib/chewy/strategy/base.rb
 - lib/chewy/strategy/bypass.rb
 - lib/chewy/strategy/delayed_sidekiq.rb
+- lib/chewy/strategy/delayed_sidekiq/redis_script.rb
 - lib/chewy/strategy/delayed_sidekiq/scheduler.rb
 - lib/chewy/strategy/delayed_sidekiq/worker.rb
 - lib/chewy/strategy/lazy_sidekiq.rb
@@ -202,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
 test_files: []