zk 1.6.2 → 1.6.3

data/Gemfile

@@ -8,8 +8,8 @@ source :rubygems
 # keep closer track of this stuff to make bisecting easier and travis more
 # accurate
 
-# git 'git://github.com/slyphon/zookeeper.git', :tag => 'dev/zk/00006' do
-#   gem 'zookeeper', '~> 1.1.0'
+# git 'git://github.com/slyphon/zookeeper.git', :tag => 'dev/zk/00008' do
+#   gem 'zookeeper', '~> 1.2.0'
 # end
 
 gem 'rake', :group => [:development, :test]

data/RELEASES.markdown

@@ -1,5 +1,9 @@
 This file notes feature differences and bugfixes contained between releases. 
 
+### v1.6.3 ###
+
+* Retry when lock creation fails due to a NoNode exception
+
 ### v1.6.2 ###
 
 * Change state call to reduce the chances of deadlocks

data/lib/zk/client/threaded.rb

@@ -156,7 +156,7 @@ module ZK
         tp_size = opts.fetch(:threadpool_size, DEFAULT_THREADPOOL_SIZE)
         @threadpool = Threadpool.new(tp_size)
 
-        @connection_timeout = opts.fetch(:timeout, DEFAULT_TIMEOUT) # maybe move this into superclass?
+        @connection_timeout = opts[:timeout] || DEFAULT_TIMEOUT # maybe move this into superclass?
         @event_handler   = EventHandler.new(self, opts)
 
         @reconnect = opts.fetch(:reconnect, true)
@@ -244,6 +244,9 @@ module ZK
 
             logger.debug { "reopening, no fork detected" }
             @last_cnx_state = Zookeeper::ZOO_CONNECTING_STATE
+            
+            timeout ||= @connection_timeout     # or @connection_timeout here is the docuemnted behavior on Base#reopen
+
             @cnx.reopen(timeout)                # ok, we werent' forked, so just reopen
 
             # this is a bit of a hack, because we need to wait until the event thread

data/lib/zk/locker/locker_base.rb

@@ -265,6 +265,8 @@ module ZK
         #
         def create_root_path!
           zk.mkdir_p(@root_lock_path)
+        rescue NoNode
+          retry
         end
 
         # performs the checks that (according to the recipe) mean that we hold

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 6
-  - 2
-  version: 1.6.2
+  - 3
+  version: 1.6.3
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zookeeper