poseidon_cluster 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 572fd136cb5145934e5c5ee72cd5b679c80284d3
-  data.tar.gz: f376b773d60c642603c45756a5626e3b67927037
+  metadata.gz: 54b28361ea6e2d74ad75503560e29230f928cf87
+  data.tar.gz: dce02dfed81efe6a59c210391d07c74cf3781083
 SHA512:
-  metadata.gz: c09941bb0135cbfd85f6d761b3accae3d5e6bf37265a7afc8eb5cc32cf135d5a5f099d558d8bf8281afb7c7901a7a86eeb3dc5bcfe65acd0615d2683e5dc7dad
-  data.tar.gz: ae1cd45aedc7587e7324b34c5a06f9ca1f196a445fc6f2b03cb4a449e396e0713e08102f6d5d85df261ce7320916f9c89398cc48bd702e11c329f4994f350300
+  metadata.gz: ac690a44445aa513d2131339f8a7bb06dfe0e442d569e1389e1aa6959c01b80b5224dee4c8733aff41d2629803a847335a4a794ae8adb59ca5bd2f6c4a0b15cc
+  data.tar.gz: 117990bd5fd6badf2bdc9286ecba6d1ec0eaaca0b87ebaaf6fb385fae371d4669adc2527593d177ffe28caecf210f4af4049873e5d0e3ef1480ac9069405b17d

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    poseidon_cluster (0.1.0)
+    poseidon_cluster (0.1.1)
       poseidon
       zk
 
@@ -54,9 +54,6 @@ GEM
       logging (~> 1.7.2)
       zookeeper (~> 1.4.0)
     zookeeper (1.4.8)
-    zookeeper (1.4.8-java)
-      slyphon-log4j (= 1.2.15)
-      slyphon-zookeeper_jar (= 3.3.5)
 
 PLATFORMS
   java

data/README.md

@@ -1,4 +1,4 @@
-# Poseidon Cluster [![Build Status](https://travis-ci.org/bsm/poseidon_cluster.png?branch=master)](https://travis-ci.org/bsm/poseidon_cluster) [![Coverage Status](https://coveralls.io/repos/bsm/poseidon_cluster/badge.png)](https://coveralls.io/r/bsm/poseidon_cluster)
+# Poseidon Cluster [![Build Status](https://travis-ci.org/bsm/poseidon_cluster.png?branch=master)](https://travis-ci.org/bsm/poseidon_cluster) [![Coverage Status](https://coveralls.io/repos/bsm/poseidon_cluster/badge.png?branch=master)](https://coveralls.io/r/bsm/poseidon_cluster?branch=master)
 
 Poseidon Cluster is a cluster extension the excellent [Poseidon](http://github.com/bpot/poseidon) Ruby client for Kafka 0.8+. It implements the distribution concept of self-rebalancing *Consumer Groups* and supports the consumption of a single topic from multiple instances.
 

data/lib/poseidon/consumer_group.rb

@@ -30,7 +30,7 @@ class Poseidon::ConsumerGroup
   # @api private
   class Consumer < ::Poseidon::PartitionConsumer
 
-    # @attr_reader [Integer] partition Consumer partition
+    # @attr_reader [Integer] partition consumer partition
     attr_reader :partition
 
     # @api private
@@ -158,10 +158,8 @@ class Poseidon::ConsumerGroup
   # Closes the consumer group gracefully, only really useful in tests
   # @api private
   def close
-    @mutex.synchronize do
-      release_all!
-      zk.close
-    end
+    release_all!
+    zk.close
   end
 
   # @param [Integer] partition
@@ -222,18 +220,18 @@ class Poseidon::ConsumerGroup
   #
   # @api public
   def checkout(opts = {})
-    @mutex.synchronize do
-      consumer = @consumers.shift
-      break false unless consumer
+    return false if @rebalancing
 
-      @consumers.push(consumer)
-      result = yield(consumer)
+    consumer = @consumers.shift
+    return false unless consumer
 
-      unless opts[:commit] == false || result == false
-        commit consumer.partition, consumer.offset
-      end
-      true
+    @consumers.push(consumer)
+    result = yield(consumer)
+
+    unless opts[:commit] == false || result == false
+      commit consumer.partition, consumer.offset
     end
+    true
   end
 
   # Convenience method to fetch messages from the broker.
@@ -360,19 +358,7 @@ class Poseidon::ConsumerGroup
     # * let POS be our index position in CG and let N = size(PT)/size(CG)
     # * assign partitions from POS*N to (POS+1)*N-1
     def rebalance!
-      @mutex.synchronize do
-        reload
-        release_all!
-
-        ids = zk.children(registries[:consumer], watch: true)
-        pms = partitions
-        rng = self.class.pick(pms.size, ids, id)
-
-        pms[rng].each do |pm|
-          consumer = claim!(pm.id)
-          @consumers.push(consumer)
-        end if rng
-      end
+      @mutex.synchronize { perform_rebalance! }
     end
 
     # Release all consumer claims
@@ -385,10 +371,10 @@ class Poseidon::ConsumerGroup
     # @raise [Timeout::Error]
     def claim!(partition)
       path = claim_path(partition)
-      Timeout.timeout(options[:claim_timout] || DEFAULT_CLAIM_TIMEOUT) do
-        sleep(0.01) while zk.create(path, id, ephemeral: true, ignore: :node_exists).nil?
+      Timeout.timeout options[:claim_timout] || DEFAULT_CLAIM_TIMEOUT do
+        sleep(0.1) while zk.create(path, id, ephemeral: true, ignore: :node_exists).nil?
       end
-      Consumer.new(self, partition, options.dup)
+      Consumer.new self, partition, options.dup
     end
 
     # Release ownership of the partition
@@ -413,4 +399,21 @@ class Poseidon::ConsumerGroup
       "#{registries[:consumer]}/#{id}"
     end
 
+    def perform_rebalance!
+      @rebalancing = true
+      reload
+      release_all!
+
+      ids = zk.children(registries[:consumer], watch: true)
+      pms = partitions
+      rng = self.class.pick(pms.size, ids, id)
+
+      pms[rng].each do |pm|
+        consumer = claim!(pm.id)
+        @consumers.push(consumer)
+      end if rng
+    ensure
+      @rebalancing = nil
+    end
+
 end

data/poseidon_cluster.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = File.basename(__FILE__, '.gemspec')
   s.summary     = "Poseidon cluster extensions"
   s.description = "Cluster extensions for Poseidon, a producer and consumer implementation for Kafka >= 0.8"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
 
   s.authors     = ["Black Square Media"]
   s.email       = "info@blacksquaremedia.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poseidon_cluster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poseidon
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Poseidon cluster extensions