ruby-kafka 0.7.0.alpha3 → 0.7.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8398bc3bc71e01dde7100ad58d90e8ae3cf6594121b1b8208ee3c7d1a339d35d
-  data.tar.gz: a6c6a4cdec82a50ba9641dbb290d4a2fa453a769c6ca566f7925f94f95b19157
+  metadata.gz: 93553029514a22802156abc20e70cf63263f2ddc6bfe4312e11bbb629eefd017
+  data.tar.gz: 14c14261e50408e8ca0b0c5f14cac94939f6756bc8c5499fd2af85280218dc80
 SHA512:
-  metadata.gz: e92ab3660ec460f97bdd2cf9f793d23c896c0cbd7be9f7d98010bce925d9f079c92a0e58e0a1eb31d9784db676adfc2889901dbd875820545e036b96da742ebb
-  data.tar.gz: 8f3426df16dd722daa0d138683e630254ce452a791fc0f5e59bfd652bf96f3454b4034330eb6b5fc0e595e45f5a9384e8d0ecbd62cd967c7e0b712e2a6d292b8
+  metadata.gz: 264f0d854be944a050f7392f43c231a3499d786b5d27bf772a6a2c7b05ed7d496f8c0855e661e4e263667abe9b2d113740d92d842310052e53797588a0375034
+  data.tar.gz: ea31b08620b1451ac663fd16eeab8816948a3a421218282ece5c2b94417931c926ffdcbafb0436e414a3136c9ecab0442a3b477c3787d106f3380c9e18f2fcb0

data/lib/kafka/consumer.rb

@@ -235,7 +235,7 @@ module Kafka
             mark_message_as_processed(message) if automatically_mark_as_processed
             @offset_manager.commit_offsets_if_necessary
 
-            @heartbeat.send_if_necessary
+            trigger_heartbeat
 
             return if !@running
           end
@@ -330,7 +330,7 @@ module Kafka
 
           @offset_manager.commit_offsets_if_necessary
 
-          @heartbeat.send_if_necessary
+          trigger_heartbeat
 
           return if !@running
         end
@@ -366,10 +366,18 @@ module Kafka
       @offset_manager.mark_as_processed(message.topic, message.partition, message.offset)
     end
 
-    def send_heartbeat_if_necessary
-      @heartbeat.send_if_necessary
+    def trigger_heartbeat
+      @heartbeat.trigger
     end
 
+    def trigger_heartbeat!
+      @heartbeat.trigger!
+    end
+
+    # Aliases for the external API compatibility
+    alias send_heartbeat_if_necessary trigger_heartbeat
+    alias send_heartbeat trigger_heartbeat!
+
     private
 
     def consumer_loop
@@ -492,7 +500,7 @@ module Kafka
 
       join_group unless @group.member?
 
-      @heartbeat.send_if_necessary
+      trigger_heartbeat
 
       resume_paused_partitions!
 
@@ -505,7 +513,9 @@ module Kafka
 
         case tag
         when :batches
-          message
+          # make sure any old batches, fetched prior to the completion of a consumer group sync,
+          # are only processed if the batches are from brokers for which this broker is still responsible.
+          message.select { |batch| @group.assigned_to?(batch.topic, batch.partition) }
         when :exception
           raise message
         end

data/lib/kafka/consumer_group.rb

@@ -31,6 +31,10 @@ module Kafka
       @assigned_partitions.select { |topic, _| @topics.include?(topic) }
     end
 
+    def assigned_to?(topic, partition)
+      subscribed_partitions.fetch(topic, []).include?(partition)
+    end
+
     def member?
       !@generation_id.nil?
     end

data/lib/kafka/heartbeat.rb

@@ -8,11 +8,13 @@ module Kafka
       @last_heartbeat = Time.now
     end
 
-    def send_if_necessary
-      if Time.now > @last_heartbeat + @interval
-        @group.heartbeat
-        @last_heartbeat = Time.now
-      end
+    def trigger!
+      @group.heartbeat
+      @last_heartbeat = Time.now
+    end
+
+    def trigger
+      trigger! if Time.now > @last_heartbeat + @interval
     end
   end
 end

data/lib/kafka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kafka
-  VERSION = "0.7.0.alpha3"
+  VERSION = "0.7.0.alpha4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha3
+  version: 0.7.0.alpha4
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc