ruby-kafka-ec2 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dde731c3652090bf18202d68b916cbdcff9ed09673bd84d5f20470a37c63373
-  data.tar.gz: d1a95de4724b3b5f85230c55a70469cc5e6c1e6008423b83f74c415bf2c9d289
+  metadata.gz: b87f937f29a107174e7a972b79e2a717780bdd28b28fa37e3601633ff1f075b0
+  data.tar.gz: 413c79ff75ccb9f9304dd5c57dfb2fb1f26b0b673eeae9cb7e7d86cb68d65e74
 SHA512:
-  metadata.gz: f37b8fa41b773933aac85f170884adb75fc0e446faf9fb92c109aa039f5a869874194dbdf3a9099899e273ef8543f75c5f7aca0fd99cff1845bc43ac081bde50
-  data.tar.gz: 78bc5df7157441563d73e19f35804069ddbb2c1863bccfe2711594c27a6caed78a5209fdd2ca7f55a3cf2302bed326ec47302720bf4253a9f8b4df950e5a0d0f
+  metadata.gz: 22dfa6ddf4e0e0f8eb5db7bd6cb9c54b25edb175186bba989b32df698e23c705754c8dff057e7d82df480a3835bea110a363177b36739bca73432206227ac680
+  data.tar.gz: 1deda3ac8da64c41f9d598e26049b667aec2d81956a98dc7ded279c8a13e517d7dc4042ab34f9f4e8a05365be46c570e274207bd5bd430210b7de458972cace3

data/lib/kafka/ec2/mixed_instance_assignment_strategy.rb

@@ -74,28 +74,29 @@ module Kafka
           member_ids = instance_id_to_member_ids[instance_id]
           member_ids.each do |member_id|
             acceptable_partition_weight = capacity * partition_weight_per_capacity / member_ids.size
-            loop do
+            while last_index < topic_partitions.size
               topic, partition = topic_partitions[last_index]
               partition_weight = partition_weights.dig(topic, partition)
-              if last_index == topic_partitions.size || acceptable_partition_weight - partition_weight < 0
-                member_id_to_acceptable_partition_weight[member_id] = acceptable_partition_weight
-                break
-              end
+              break if acceptable_partition_weight - partition_weight < 0
 
               group_assignment[member_id].assign(topic, [partition])
-              last_index += 1
               acceptable_partition_weight -= partition_weight
+
+              last_index += 1
             end
+
+            member_id_to_acceptable_partition_weight[member_id] = acceptable_partition_weight
           end
         end
 
-        if last_index < topic_partitions.size
-          member_id_to_acceptable_partition_weight.sort_by { |_, remaining| -remaining }.each do |member_id, _|
-            topic, partition = topic_partitions[last_index]
-            group_assignment[member_id].assign(topic, [partition])
-            last_index += 1
-            break if last_index == topic_partitions.size
-          end
+        while last_index < topic_partitions.size
+          member_id, _ = member_id_to_acceptable_partition_weight.max_by { |_, remaining| remaining }
+          topic, partition = topic_partitions[last_index]
+          group_assignment[member_id].assign(topic, [partition])
+
+          member_id_to_acceptable_partition_weight[member_id] -= partition_weights.dig(topic, partition)
+
+          last_index += 1
         end
 
         group_assignment

data/lib/kafka/ec2/version.rb

@@ -1,5 +1,5 @@
 module Kafka
   class EC2
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka-ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - abicky