karafka-rdkafka 0.31.0-aarch64-linux-gnu → 0.32.0-aarch64-linux-gnu

data/lib/rdkafka/share_consumer.rb

@@ -96,13 +96,17 @@ module Rdkafka
       # and after close or in a forked child, where the native handle must not be touched.
       # librdkafka assigns the name at creation, so no broker connection is required.
       @name = Rdkafka::Bindings.rd_kafka_name(Rdkafka::Bindings::NativeShareConsumer.new(native)[:rkshare_rk])
-      # Guards handle teardown against in-flight calls: increments happen under this mutex and
-      # close holds it while draining and destroying (mirrors NativeKafka's approach)
+      # Guards handle teardown against in-flight calls: the operations in progress counter
+      # changes only under this mutex, and close holds it while destroying (mirrors NativeKafka)
       @access_mutex = Mutex.new
-      # Separate mutex for decrements so a blocked close (holding @access_mutex) cannot
-      # deadlock with an operation trying to finish
-      @decrement_mutex = Mutex.new
-      # Number of calls currently using the native handle
+      # Signalled when `#close` ends and, only while `#close` waits, when the operations in
+      # progress counter reaches zero. `#close` waits on it with `@access_mutex` released, so calls
+      # that started before it can still decrement the counter.
+      @operations_done = ConditionVariable.new
+      # Set while `#close` runs, so no new call starts until it ends
+      @closing = false
+      # Number of calls currently using the native handle, changed only under `@access_mutex`, so
+      # no update is lost on Rubies without a GVL (JRuby)
       @operations_in_progress = 0
 
       ObjectSpace.define_finalizer(self, self.class.finalizer(@state))
@@ -541,31 +545,15 @@ module Rdkafka
       return if closed?
 
       @access_mutex.synchronize do
-        # Wait for in-flight calls on other threads to finish using the handle. New calls block
-        # on the mutex above while we hold it.
-        sleep(Defaults::NATIVE_KAFKA_SYNCHRONIZE_SLEEP_INTERVAL_MS / 1_000.0) until @operations_in_progress.zero?
+        @operations_done.wait(@access_mutex) while @closing
+        @closing = true
 
-        native = @state.native
-
-        # Lost the race against a concurrent close that already finished
-        return if native.nil?
-
-        # librdkafka leaves the instance intact when close/destroy fail, and validate! raises
-        # before any reference (or the finalizer) is dropped, so the caller can retry close
-        # and the handle cannot leak silently.
-        #
-        # The close step is skipped when librdkafka already considers the consumer closed
-        # (e.g. a prior close attempt succeeded but its destroy failed and was retried).
-        if Rdkafka::Bindings.rd_kafka_share_consumer_closed(native).zero?
-          Rdkafka::RdkafkaError.validate!(Rdkafka::Bindings.rd_kafka_share_consumer_close(native))
+        begin
+          close_native
+        ensure
+          @closing = false
+          @operations_done.broadcast
         end
-
-        Rdkafka::RdkafkaError.validate!(Rdkafka::Bindings.rd_kafka_share_destroy(native))
-
-        # The native handle is gone only now; drop all references and the finalizer
-        ObjectSpace.undefine_finalizer(self)
-        @state.native = nil
-        @state.ack_callback = nil
       end
 
       nil
@@ -573,10 +561,46 @@ module Rdkafka
 
     private
 
+    # Destroys the native handle once no other thread uses it. Runs under `@access_mutex`, with
+    # `@closing` set so no new call starts.
+    #
+    # @return [nil]
+    # @raise [RdkafkaError] When closing or destroying reported an error
+    def close_native
+      # Wait for in-flight calls on other threads to finish using the handle. The wait releases
+      # `@access_mutex`, so those calls can decrement the counter, while `@closing` keeps new
+      # calls out.
+      @operations_done.wait(@access_mutex) until @operations_in_progress.zero?
+
+      native = @state.native
+
+      # Lost the race against a concurrent close that already finished
+      return if native.nil?
+
+      # librdkafka leaves the instance intact when close/destroy fail, and validate! raises
+      # before any reference (or the finalizer) is dropped, so the caller can retry close
+      # and the handle cannot leak silently.
+      #
+      # The close step is skipped when librdkafka already considers the consumer closed
+      # (e.g. a prior close attempt succeeded but its destroy failed and was retried).
+      if Rdkafka::Bindings.rd_kafka_share_consumer_closed(native).zero?
+        Rdkafka::RdkafkaError.validate!(Rdkafka::Bindings.rd_kafka_share_consumer_close(native))
+      end
+
+      Rdkafka::RdkafkaError.validate!(Rdkafka::Bindings.rd_kafka_share_destroy(native))
+
+      # The native handle is gone only now; drop all references and the finalizer
+      ObjectSpace.undefine_finalizer(self)
+      @state.native = nil
+      @state.ack_callback = nil
+
+      nil
+    end
+
     # Executes a block with the native share handle while tracking the call so {#close} cannot
-    # tear the handle down mid-call from another thread. Increments happen under the access
-    # mutex that close holds for the whole teardown, so once close is draining no new call can
-    # slip in; librdkafka's own single-owner gate still rejects genuinely concurrent API calls.
+    # tear the handle down mid-call from another thread. New calls wait while close runs, so once
+    # close is draining no new call can slip in; librdkafka's own single-owner gate still rejects
+    # genuinely concurrent API calls.
     #
     # @param method [Symbol] public method name, used for the ClosedConsumerError
     # @yield [FFI::Pointer] the native share handle
@@ -586,7 +610,10 @@ module Rdkafka
       # (the only internal holder) - the handle is going away, so reject before tracking
       raise Rdkafka::ClosedConsumerError.new(method) if @access_mutex.owned?
 
-      @access_mutex.synchronize { @operations_in_progress += 1 }
+      @access_mutex.synchronize do
+        @operations_done.wait(@access_mutex) while @closing
+        @operations_in_progress += 1
+      end
 
       begin
         native = @state.native
@@ -597,7 +624,10 @@ module Rdkafka
 
         yield(native)
       ensure
-        @decrement_mutex.synchronize { @operations_in_progress -= 1 }
+        @access_mutex.synchronize do
+          @operations_in_progress -= 1
+          @operations_done.broadcast if @closing && @operations_in_progress.zero?
+        end
       end
     end
 

data/lib/rdkafka/version.rb

@@ -2,7 +2,7 @@
 
 module Rdkafka
   # Current rdkafka-ruby gem version
-  VERSION = "0.31.0"
+  VERSION = "0.32.0"
   # Target librdkafka version to be used
   LIBRDKAFKA_VERSION = "2.16.0"
   # SHA256 hash of the librdkafka source tarball for verification

data/lib/rdkafka.rb

@@ -15,6 +15,8 @@ require "rdkafka/abstract_handle"
 require "rdkafka/admin"
 require "rdkafka/admin/alter_consumer_group_offsets_handle"
 require "rdkafka/admin/alter_consumer_group_offsets_report"
+require "rdkafka/admin/list_consumer_group_offsets_handle"
+require "rdkafka/admin/list_consumer_group_offsets_report"
 require "rdkafka/admin/delete_consumer_group_offsets_handle"
 require "rdkafka/admin/delete_consumer_group_offsets_report"
 require "rdkafka/admin/create_topic_handle"
@@ -51,6 +53,7 @@ require "rdkafka/admin/describe_consumer_groups_report"
 require "rdkafka/admin/acl_binding_result"
 require "rdkafka/admin/config_binding_result"
 require "rdkafka/admin/config_resource_binding_result"
+require "rdkafka/error"
 require "rdkafka/bindings"
 require "rdkafka/callbacks"
 require "rdkafka/callbacks/base_handler"
@@ -58,6 +61,7 @@ require "rdkafka/callbacks/create_topic_handler"
 require "rdkafka/callbacks/delete_topic_handler"
 require "rdkafka/callbacks/create_partitions_handler"
 require "rdkafka/callbacks/alter_consumer_group_offsets_handler"
+require "rdkafka/callbacks/list_consumer_group_offsets_handler"
 require "rdkafka/callbacks/delete_consumer_group_offsets_handler"
 require "rdkafka/callbacks/delete_groups_handler"
 require "rdkafka/callbacks/delete_records_handler"
@@ -80,7 +84,6 @@ require "rdkafka/consumer/allocator"
 require "rdkafka/consumer/topic_partition_list"
 require "rdkafka/share_consumer"
 require "rdkafka/share_consumer/message"
-require "rdkafka/error"
 require "rdkafka/metadata"
 require "rdkafka/native_kafka"
 require "rdkafka/producer/partitions_count_cache"

data/package-lock.json

@@ -286,9 +286,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.0.tgz",
-      "integrity": "sha512-hpd+HLON7HdZXqYchMM/+LaTTbdK0AU3NngIJ4KVyWbY9bfQqdL9cD+4yf6dUoU2Ap4VsU0JkQi6FxAI1B2mXQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.9.1.tgz",
+      "integrity": "sha512-j7WyPdf0CJoutMzMoPLF/bVXHtKZIT9Rb4eGeEbWw8X2t5oirjPgpL+OpaENZrILYaXqYwnVH+qgUwVbl+pUJQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {

data/renovate.json

@@ -97,6 +97,13 @@
         "ruby/setup-ruby"
       ],
       "minimumReleaseAge": "5 days"
+    },
+    {
+      "description": "Keep the ubuntu:22.04 build container of the precompiled gnu libraries; a newer Ubuntu raises their glibc floor",
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["ubuntu"],
+      "matchFileNames": [".github/workflows/**"],
+      "allowedVersions": "/^22\\.04$/"
     }
   ],
   "labels": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: aarch64-linux-gnu
 authors:
 - Thijs Cadier
@@ -52,34 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_portile2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '12'
 description: Modern Kafka client library for Ruby based on librdkafka
 email:
 - contact@karafka.io
@@ -133,6 +105,8 @@ files:
 - lib/rdkafka/admin/describe_topics_report.rb
 - lib/rdkafka/admin/incremental_alter_configs_handle.rb
 - lib/rdkafka/admin/incremental_alter_configs_report.rb
+- lib/rdkafka/admin/list_consumer_group_offsets_handle.rb
+- lib/rdkafka/admin/list_consumer_group_offsets_report.rb
 - lib/rdkafka/admin/list_consumer_groups_handle.rb
 - lib/rdkafka/admin/list_consumer_groups_report.rb
 - lib/rdkafka/admin/list_offsets_handle.rb
@@ -170,6 +144,7 @@ files:
 - lib/rdkafka/callbacks/describe_consumer_groups_handler.rb
 - lib/rdkafka/callbacks/describe_topics_handler.rb
 - lib/rdkafka/callbacks/incremental_alter_configs_handler.rb
+- lib/rdkafka/callbacks/list_consumer_group_offsets_handler.rb
 - lib/rdkafka/callbacks/list_consumer_groups_handler.rb
 - lib/rdkafka/callbacks/list_offsets_handler.rb
 - lib/rdkafka/clients.rb
@@ -227,5 +202,5 @@ rubygems_version: 4.0.20
 specification_version: 4
 summary: The rdkafka gem is a modern Kafka client library for Ruby based on librdkafka.
   It wraps the production-ready C client using the ffi gem and targets Kafka 1.0+
-  and Ruby 2.7+.
+  and Ruby 3.3+.
 test_files: []