kafkat 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhlMGY5MzIyYWFhZjdlZmE3YjlmM2M3MTc3MGU0MjQyYzQ2YjA5Zg==
+    MzRmNjZhMzY3YjRlNzRkZWFiMjhlNzE2ZTE3YWQyMTAzMDZkMmNiZQ==
   data.tar.gz: !binary |-
-    NDNlMjdjNDAxMjc4NTcyZDE2YzliNjI5OTBkNmJkMDA2OGM3Yjc0Zg==
+    MDg5MDkwMTk1ZjU1MDBlYWIzYThmY2ZhYTg3OWY3ODYxZDY1ZTJlNQ==
 SHA512:
   metadata.gz: !binary |-
-    MDdkOWI2ZjBhNjU2ZWM3NmI5YTMwNTFjYTA3MjQ5NjJiNDVjOTFiMGRkMDMw
-    ZmNkNThiNGJhYzYyNjIwYzczOTY0MjNhY2ZlYzA1MTQ2Y2Y4YTQxZDcwNTVm
-    NWU4YjA0NGYzMDQ1Mjc3ZjBiMGUxMTllM2U0N2QwMDdkODYzOGQ=
+    NzA4ODM1NDRkMGNkNmYxODZlMzNkMDQ0YWEyYTY0MGRiNTQ4Njg5MGEyOWU2
+    YzVhYjI2ZjM4YjZjYjUzYWRhYjA0YTIxMDcyNTM2MTVhZjJjYjVkZTNiYzM0
+    ZjQ4Y2FiZTBiZWJmOGEyNDUxMjQyM2IxZTkyYjFmZTQ0Y2M4NDQ=
   data.tar.gz: !binary |-
-    MzU2ODcyZWFmY2VjMmFiM2NkMDMxNDRjNmQ4NGU5Y2JhOTE5MDczMzYzZGFj
-    MjhmOGE5MjVjNzViZWM3ZDJjMTkzZmZhZGYxMjI1Y2Q1NWEzMDU3ODc5MWUy
-    NzAyMTBlNmExN2E5M2U2MGM5YWZkY2FkNTkxZTAyMjY3NDE2ZTI=
+    YWMxYTY2ZDVjMjMzYTRlMWIwN2E2NWQyNTE4NTdkYTM5NTVmNjBkNWUwMzJk
+    ZTE4MmE5ZDJjNjBlZGQyYWI1NzA1NmNmN2U4ZjBkMGNkNjQ5ZDFmMjhjYjAw
+    ZGFlMjc5M2FkYzNkMTVlYzNmNDYzMjdiYzJlNTM5M2JjOGE2OTY=

data/.gitignore

@@ -3,5 +3,5 @@
 *.iws
 *.iml
 *.ipr
-
+Gemfile.lock
 reports

data/lib/kafkat/command/drain.rb

@@ -6,7 +6,7 @@ module Kafkat
       usage 'drain <broker id> [--topic <t>] [--brokers <ids>]',
             'Reassign partitions from a specific broker to destination brokers.'
 
-      # For each partition (of speicified topic) on the source broker, the command is to
+      # For each partition (of specified topic) on the source broker, the command is to
       # assign the partition to one of the destination brokers that does not already have
       # this partition, along with existing brokers to achieve minimal movement of data.
       # To help distribute data evenly, if there are more than one destination brokers
@@ -57,6 +57,7 @@ module Kafkat
           t.partitions.each do |p|
             if p.replicas.include? source_broker
               replicas = p.replicas - [source_broker]
+              source_broker_is_leader = p.replicas.first == source_broker
               potential_broker_ids = destination_brokers - replicas
               if potential_broker_ids.empty?
                 print "ERROR: Not enough destination brokers to reassign topic \"#{t.name}\".\n"
@@ -66,7 +67,11 @@ module Kafkat
               num_partitions_on_potential_broker =
                 partitions_by_broker.select { |id, _| potential_broker_ids.include? id }
               assigned_broker_id = num_partitions_on_potential_broker.min_by{ |id, num| num }[0]
-              replicas << assigned_broker_id
+              if source_broker_is_leader
+                replicas.unshift(assigned_broker_id)
+              else
+                replicas << assigned_broker_id
+              end
               partitions_by_broker[assigned_broker_id] += 1
 
               assignments << Assignment.new(t.name, p.id, replicas)

data/lib/kafkat/utility/formatting.rb

@@ -2,7 +2,7 @@ module Kafkat
   module Formatting
     def justify(field, width=2)
       field = field.to_s
-      count = [width - (field.length / 8), 0].max
+      count = [width - (field.length / 8), 1].max
       field + "\t" * count
     end
 

data/lib/kafkat/version.rb

@@ -1,3 +1,3 @@
 module Kafkat
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/spec/factories/topic.rb

@@ -4,35 +4,35 @@ module Kafkat
       name "topic_name"
 
       factory :topic_with_one_empty_broker do
-        partitions {[Partition.new(name, 0, [0], 0, 0),
-                     Partition.new(name, 1, [1], 1, 1),
-                     Partition.new(name, 2, [0], 0, 0),
-                     Partition.new(name, 3, [0], 0, 0),
-                     Partition.new(name, 4, [1], 1, 1)]}
+        partitions {[Partition.new(name, 0, [0], 0, [0]),
+                     Partition.new(name, 1, [1], 1, [1]),
+                     Partition.new(name, 2, [0], 0, [0]),
+                     Partition.new(name, 3, [0], 0, [0]),
+                     Partition.new(name, 4, [1], 1, [1])]}
       end
 
       factory :topic_rep_factor_one do
-        partitions {[Partition.new(name, 0, [0], 0, 0),
-                     Partition.new(name, 1, [1], 1, 1),
-                     Partition.new(name, 2, [2], 2, 2),
-                     Partition.new(name, 3, [0], 0, 0),
-                     Partition.new(name, 4, [1], 1, 1)]}
+        partitions {[Partition.new(name, 0, [0], 0, [0]),
+                     Partition.new(name, 1, [1], 1, [1]),
+                     Partition.new(name, 2, [2], 2, [2]),
+                     Partition.new(name, 3, [0], 0, [0]),
+                     Partition.new(name, 4, [1], 1, [1])]}
       end
 
       factory :topic_rep_factor_two do
-        partitions {[Partition.new(name, 0, [0, 1], 0, 0),
-                     Partition.new(name, 1, [0, 2], 2, 2),
-                     Partition.new(name, 2, [1, 2], 1, 1),
-                     Partition.new(name, 3, [0, 1], 0, 0),
-                     Partition.new(name, 4, [0, 2], 2, 2)]}
+        partitions {[Partition.new(name, 0, [0, 1], 0, [0]),
+                     Partition.new(name, 1, [0, 2], 2, [2]),
+                     Partition.new(name, 2, [1, 2], 1, [1]),
+                     Partition.new(name, 3, [0, 1], 0, [0]),
+                     Partition.new(name, 4, [0, 2], 2, [2])]}
       end
 
       factory :topic_rep_factor_three do
-        partitions {[Partition.new(name, 0, [0, 1, 2], 0, 0),
-                     Partition.new(name, 1, [0, 1, 2], 1, 1),
-                     Partition.new(name, 2, [0, 1, 2], 2, 2),
-                     Partition.new(name, 3, [0, 1, 2], 0, 0),
-                     Partition.new(name, 4, [0, 1, 2], 1, 1)]}
+        partitions {[Partition.new(name, 0, [0, 1, 2], 0, [0]),
+                     Partition.new(name, 1, [0, 1, 2], 1, [1]),
+                     Partition.new(name, 2, [0, 1, 2], 2, [2]),
+                     Partition.new(name, 3, [0, 1, 2], 0, [0]),
+                     Partition.new(name, 4, [0, 1, 2], 1, [1])]}
       end
     end
   end

data/spec/lib/kafkat/command/drain_spec.rb

@@ -13,7 +13,7 @@ module Kafkat
         assignments = drain.generate_assignments(broker_id,
                                                  {"topic_name" => topic_rep_factor_one},
                                                  destination_broker_ids)
-        expect(assignments).to have_exactly(2).Partition
+        expect(assignments).to have_exactly(2).items
         expect(assignments[0].replicas).to eq([2])
         expect(assignments[1].replicas).to eq([1])
       end
@@ -25,11 +25,11 @@ module Kafkat
         assignments = drain.generate_assignments(broker_id,
                                                  {"topic_name" => topic_rep_factor_two},
                                                  destination_broker_ids)
-        expect(assignments).to have_exactly(4).Partition
-        expect(assignments[0].replicas).to eq([1, 2])
-        expect(assignments[1].replicas).to eq([2, 1])
-        expect(assignments[2].replicas).to eq([1, 2])
-        expect(assignments[3].replicas).to eq([2, 1])
+        expect(assignments).to have_exactly(4).items
+        expect(assignments[0].replicas).to eq([2, 1])
+        expect(assignments[1].replicas).to eq([1, 2])
+        expect(assignments[2].replicas).to eq([2, 1])
+        expect(assignments[3].replicas).to eq([1, 2])
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafkat
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Nelson Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -181,7 +181,6 @@ files:
 - .simplecov
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -247,3 +246,4 @@ test_files:
 - spec/factories/topic.rb
 - spec/lib/kafkat/command/drain_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,69 +0,0 @@
-PATH
-  remote: .
-  specs:
-    kafkat (0.0.11)
-      colored (~> 1.2)
-      highline (~> 1.6, >= 1.6.21)
-      retryable (~> 1.3, >= 1.3.5)
-      trollop (~> 2.0)
-      zk (~> 1.9, >= 1.9.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    colored (1.2)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    factory_girl (4.5.0)
-      activesupport (>= 3.0.0)
-    highline (1.7.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.7.0)
-    multi_json (1.11.1)
-    rake (10.4.2)
-    retryable (1.3.6)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-collection_matchers (1.1.2)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.5)
-    trollop (2.1.2)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    zk (1.9.6)
-      zookeeper (~> 1.4.0)
-    zookeeper (1.4.11)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  factory_girl (~> 4.5.0)
-  kafkat!
-  rake
-  rspec (~> 3.2.0)
-  rspec-collection_matchers (~> 1.1.0)
-  simplecov