zk 1.7.4 → 1.7.5

data/README.markdown

@@ -25,7 +25,7 @@ Development is sponsored by [Snapfish][] and has been generously released to the
 
 ZooKeeper is a multi-purpose tool that is designed to allow you to write code that coordinates many nodes in a cluster. It can be used as a directory service, a configuration database, and can provide cross-cluster [locking][], [leader election][], and [group membership][] (to name a few). It presents to the user what looks like a distributed file system, with a few important differences: every node can have children _and_ data, and there is a 1MB limit on data size for any given node. ZooKeeper provides atomic semantics and a simple API for manipulating data in the heirarchy.
 
-One of the most useful aspects of ZooKeeper is the ability to set "[watches][]" on nodes. This allows one to be notified when a node has been deleted, created, changd, or has had its list of child znodes modified. The asynchronous nature of these watches enables you to write code that can _react_ to changes in your environment without polling and busy-waiting.
+One of the most useful aspects of ZooKeeper is the ability to set "[watches][]" on nodes. This allows one to be notified when a node has been deleted, created, changed, or has had its list of child znodes modified. The asynchronous nature of these watches enables you to write code that can _react_ to changes in your environment without polling and busy-waiting.
 
 Znodes can be _ephemeral_, which means that when the connection that created them goes away, they're automatically cleaned up, and all the clients that were watching them are notified of the deletion. This is an incredibly useful mechanism for providing _presence_ in a cluster ("which of my thingamabobers are up?). If you've ever run across a stale pid file or lock, you can imagine how useful this feature can be. 
 

data/RELEASES.markdown

@@ -1,5 +1,9 @@
 This file notes feature differences and bugfixes contained between releases. 
 
+### v1.7.5 ###
+
+* fix for jruby 1.7 (issue #53)
+
 ### v1.7.4 ###
 
 * Narsty bug in Locker (#54) 

data/lib/zk/locker/locker_base.rb

@@ -327,8 +327,10 @@ module ZK
         #
         def create_lock_path!(prefix='lock')
           @mutex.synchronize do
-            @lock_path ||= @zk.create("#{root_lock_path}/#{prefix}", :mode => :ephemeral_sequential)
-            @parent_stat ||= @zk.stat(root_lock_path)
+            unless lock_path_exists?
+              @lock_path = @zk.create("#{root_lock_path}/#{prefix}", :mode => :ephemeral_sequential)
+              @parent_stat = @zk.stat(root_lock_path)
+            end
           end
 
           logger.debug { "got lock path #{@lock_path}" }
@@ -338,6 +340,16 @@ module ZK
           retry
         end
 
+        # if we previously had a lock path, check if it still exists
+        #
+        def lock_path_exists?
+          @mutex.synchronize do
+            return false unless @lock_path
+            return false unless root_lock_path_same?
+            zk.exists?(@lock_path)
+          end
+        end
+
         # if the root_lock_path has the same stat .ctime as the one
         # we cached when we created our lock path, then we can be sure
         # that we actually own the lock_path 

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
 end

data/zk.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{A high-level wrapper around the zookeeper driver}
   s.description = s.summary + "\n"
 
-  s.add_runtime_dependency 'zookeeper', '~> 1.3.0'
+  s.add_runtime_dependency 'zookeeper', '~> 1.4.0'
   s.add_runtime_dependency 'logging',   '~> 1.7.2'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 5
+  version: 1.7.5
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-10 00:00:00 Z
+date: 2012-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zookeeper
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
         - 1
-        - 3
+        - 4
         - 0
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency