ruby-kafka 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cae08d9f12b1f6758def92d1d02ab046993bb11eed7b985b91be9bd5eee57b51
-  data.tar.gz: 89564d3428e93b5d377d995a8400a27fe07d40e09bb860371c78cca550549d7a
+  metadata.gz: d8ea1d759bb30b26f2130fd560d2f09bd46b0960add9a1e65460e9643cb50142
+  data.tar.gz: 9816bf4c2c73567aa0a12fbc0cfe79af84861517a1845eaba5881ac05bd99f77
 SHA512:
-  metadata.gz: b602a8d11ceb4a489a091b7c316493a58e3c009d1f02d3b9008e882408bd4ff9c4f5ce51f4f50aec6c9478eab782b617268b206fee76e50ead20eff260bfa6a2
-  data.tar.gz: ddaae218d4d56885b610e89cc9aa9cd70d12ea196e888c5b50a2ff7be7d53e35932403b81c99e131cbaecc9d56340cd607b381d09ed1a25db324440a35e2ddb5
+  metadata.gz: c53dbab79d1157151328c2d718d1d2d2ba9600208419f5788c231df3cc63542f05bfe514cea199d72dde781eab252cf89fd9889f0e22c148afa210d1f499e28a
+  data.tar.gz: 8a8bc9e3dc7d7edb465ebe990c4343330b03db21d595f93cb82698e7abe68166f132975e3e1ff95805b663c2d8227b87e74342b4efab412fda3c4d43be190a97

data/.circleci/config.yml

@@ -26,6 +26,8 @@ jobs:
           KAFKA_DELETE_TOPIC_ENABLE: true
       - image: wurstmeister/kafka:2.11-0.11.0.3
         environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9093
           KAFKA_PORT: 9093
           KAFKA_ZOOKEEPER_CONNECT: localhost:2181
           KAFKA_DELETE_TOPIC_ENABLE: true
@@ -105,6 +107,38 @@ jobs:
       - run: bundle install --path vendor/bundle
       - run: bundle exec rspec --profile --tag functional spec/functional
 
+  kafka-2.0:
+    docker:
+      - image: circleci/ruby:2.5.1-node
+        environment:
+          LOG_LEVEL: DEBUG
+      - image: wurstmeister/zookeeper
+      - image: wurstmeister/kafka:2.11-2.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9092
+          KAFKA_PORT: 9092
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+          KAFKA_DELETE_TOPIC_ENABLE: true
+      - image: wurstmeister/kafka:2.11-2.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9093
+          KAFKA_PORT: 9093
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+          KAFKA_DELETE_TOPIC_ENABLE: true
+      - image: wurstmeister/kafka:2.11-2.0.0
+        environment:
+          KAFKA_ADVERTISED_HOST_NAME: localhost
+          KAFKA_ADVERTISED_PORT: 9094
+          KAFKA_PORT: 9094
+          KAFKA_ZOOKEEPER_CONNECT: localhost:2181
+          KAFKA_DELETE_TOPIC_ENABLE: true
+    steps:
+      - checkout
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec rspec --profile --tag functional spec/functional
+
 workflows:
   version: 2
   test:
@@ -112,4 +146,5 @@ workflows:
       - unit
       - kafka-0.11
       - kafka-1.0.0
-      - kafka-1.1
+      - kafka-1.1
+      - kafka-2.0

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Changes and additions to the library will be listed here.
 
 ## Unreleased
 
+## 0.7.3
+
+- Synchronize access to @worker_thread and @timer_thread in AsyncProducer to prevent creating multiple threads (#661).
+
 ## 0.7.2
 
 - Handle case when paused partition does not belong to group on resume (#656).

data/lib/kafka/async_producer.rb

@@ -59,6 +59,7 @@ module Kafka
   #     producer.shutdown
   #
   class AsyncProducer
+    THREAD_MUTEX = Mutex.new
 
     # Initializes a new AsyncProducer.
     #
@@ -146,11 +147,15 @@ module Kafka
     private
 
     def ensure_threads_running!
-      @worker_thread = nil unless @worker_thread && @worker_thread.alive?
-      @worker_thread ||= Thread.new { @worker.run }
+      THREAD_MUTEX.synchronize do
+        @worker_thread = nil unless @worker_thread && @worker_thread.alive?
+        @worker_thread ||= Thread.new { @worker.run }
+      end
 
-      @timer_thread = nil unless @timer_thread && @timer_thread.alive?
-      @timer_thread ||= Thread.new { @timer.run }
+      THREAD_MUTEX.synchronize do
+        @timer_thread = nil unless @timer_thread && @timer_thread.alive?
+        @timer_thread ||= Thread.new { @timer.run }
+      end
     end
 
     def buffer_overflow(topic, message)

data/lib/kafka/consumer.rb

@@ -110,6 +110,7 @@ module Kafka
     # @return [nil]
     def stop
       @running = false
+      @fetcher.stop
       @cluster.disconnect
     end
 

data/lib/kafka/fetcher.rb

@@ -28,12 +28,6 @@ module Kafka
 
       # The maximum number of bytes to fetch per partition, by topic.
       @max_bytes_per_partition = {}
-
-      @thread = Thread.new do
-        loop while true
-      end
-
-      @thread.abort_on_exception = true
     end
 
     def subscribe(topic, max_bytes_per_partition:)
@@ -49,16 +43,21 @@ module Kafka
     end
 
     def start
-      @commands << [:start, []]
-    end
+      return if @running
 
-    def handle_start
-      raise "already started" if @running
+      @thread = Thread.new do
+        while @running
+          loop
+        end
+        @logger.info "Fetcher thread exited."
+      end
+      @thread.abort_on_exception = true
 
       @running = true
     end
 
     def stop
+      return unless @running
       @commands << [:stop, []]
     end
 
@@ -81,14 +80,14 @@ module Kafka
         queue_size: @queue.size,
       })
 
+      return unless @running
+
       if !@commands.empty?
         cmd, args = @commands.deq
 
         @logger.debug "Handling fetcher command: #{cmd}"
 
         send("handle_#{cmd}", *args)
-      elsif !@running
-        sleep 0.1
       elsif @queue.size < @max_queue_size
         step
       else
@@ -110,6 +109,7 @@ module Kafka
 
     def handle_stop(*)
       @running = false
+      @commands.clear
 
       # After stopping, we need to reconfigure the topics and partitions to fetch
       # from. Otherwise we'd keep fetching from a bunch of partitions we may no

data/lib/kafka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kafka
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc