promiscuous-poseidon_cluster 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0a3206a576efca5e80710de7873bdf951b4fda0
-  data.tar.gz: 588e34330624b29fa6a127b67c24eaafb679a60f
+  metadata.gz: bf1cd4ee132f920c59ae5c234b0898b9bad8e24f
+  data.tar.gz: 2ad72d1618745591bf199208d43d9b985d00377d
 SHA512:
-  metadata.gz: cccda6adc5aade31d9c90fbac1c175cd261848e44d15e2658fde60259ba334a67cfe1b60f2a38c00ba89dbe981b6d97b60bae3a3036260949e48f95530d0dbd2
-  data.tar.gz: 6ba006802533829e84ff1b2a25f175d4803af498e500dd1f0be4d9b0ff905e5b016b11ff09f301afb399af0c39d8a8aaba631e3842a94506b0a2f20f5f217166
+  metadata.gz: 2109520672c090b00f82218e9ea28b12aaecdc80763b5d8c2ca058660c58bbef00bd0f82314f9d71f789d7807f97dd89435519bd0486b1f08967faa18e5f78b9
+  data.tar.gz: d4522d89f6a13d4066704600101806a23935f436351e50c03c2dc8705398d5b10ec669acfe9c64e372d87f6710ea824d5f479c4982793e120c09fa3648d4ce09

data/lib/poseidon/consumer_group.rb

@@ -125,9 +125,10 @@ class Poseidon::ConsumerGroup
   # @return [Hash<Symbol,String>] registry paths
   def registries
     @registries ||= {
+      brokers:  "/brokers/topics/#{name}",
       consumer: "/consumers/#{name}/ids",
       owner:    "/consumers/#{name}/owners/#{topic}",
-      offset:   "/consumers/#{name}/offsets/#{topic}",
+      offset:   "/consumers/#{name}/offsets/#{topic}"
     }
   end
 
@@ -155,6 +156,7 @@ class Poseidon::ConsumerGroup
       zk.mkdir_p(path)
     end
     zk.create(consumer_path, "{}", {:ephemeral => true})
+    zk.register(registries[:brokers]) { rebalance! }
     zk.register(registries[:consumer]) { rebalance! }
 
     rebalance!
@@ -387,6 +389,9 @@ class Poseidon::ConsumerGroup
         release_all!
         reload_metadata
 
+        # make sure we rebalance when partition ownership changes
+        zk.stat(registries[:brokers], {:watch => true})
+
         consumer_ids    = zk.children(registries[:consumer], {:watch => true}).sort
         partition_list  = partitions
         responsible_for = self.class.pick(partition_list.size, consumer_ids, id)

data/spec/lib/poseidon/consumer_group_spec.rb

@@ -38,6 +38,7 @@ describe Poseidon::ConsumerGroup do
   before do
     allow(ZK).to receive_messages(new: zk_client)
     allow(zk_client).to receive(:children).and_return(nil, ["my-group-UNIQUEID"])
+    allow(zk_client).to receive(:stat)
     allow(Poseidon::Cluster).to receive_messages(guid: "UNIQUEID")
     allow_any_instance_of(Poseidon::ConsumerGroup).to receive(:sleep)
     allow_any_instance_of(Poseidon::PartitionConsumer).to receive_messages(resolve_offset_if_necessary: 0)
@@ -58,6 +59,7 @@ describe Poseidon::ConsumerGroup do
   its(:metadata)       { should be_instance_of(Poseidon::ClusterMetadata) }
   its(:topic_metadata) { should be_instance_of(Poseidon::TopicMetadata) }
   its(:registries)     { should == {
+    brokers:  "/brokers/topics/my-group",
     consumer: "/consumers/my-group/ids",
     owner:    "/consumers/my-group/owners/mytopic",
     offset:   "/consumers/my-group/offsets/mytopic",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous-poseidon_cluster
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Black Square Media
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poseidon