zookeeper 1.1.2-java → 1.1.3-java

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.1.2 backport change from 1.2.1: make assert_open more sane
+
 v1.1.1 Cleanup after code review (h/t @eric)
 
   * While hunting down this bug: https://bugs.ruby-lang.org/issues/6438

data/ext/zookeeper_base.rb

@@ -117,8 +117,7 @@ class ZookeeperBase
   # if either of these happen, the user will need to renegotiate a connection via reopen
   def assert_open
     @mutex.synchronize do
-      raise Exceptions::SessionExpired if state == ZOO_EXPIRED_SESSION_STATE
-      raise Exceptions::NotConnected   unless connected?
+      raise Exceptions::NotConnected if closed?
       if forked?
         raise InheritedConnectionError, <<-EOS.gsub(/(?:^|\n)\s*/, ' ').strip
           You tried to use a connection inherited from another process 

data/lib/zookeeper/continuation.rb

@@ -82,6 +82,9 @@ module Zookeeper
       @mutex  = Mutex.new
       @cond   = ConditionVariable.new
       @rval   = nil
+
+      # make this error reporting more robust if necessary, right now, just set to state
+      @error  = nil
       
       # set to true when an event occurs that would cause the caller to
       # otherwise block forever
@@ -90,9 +93,17 @@ module Zookeeper
 
     # the caller calls this method and receives the response from the async loop
     def value
-      @mutex.lock
-      begin
-        @cond.wait(@mutex) until @rval
+      @mutex.synchronize do
+        @cond.wait(@mutex) until @rval or @error
+
+        case @error
+        when nil
+          # ok, nothing to see here, carry on
+        when ZOO_EXPIRED_SESSION_STATE
+          raise Exceptions::SessionExpired, "connection has expired"
+        else
+          raise Exceptions::NotConnected, "connection state is #{STATE_NAMES[@error]}"
+        end
 
         case @rval.length
         when 1
@@ -100,8 +111,6 @@ module Zookeeper
         else
           return @rval
         end
-      ensure
-        @mutex.unlock
       end
     end
 
@@ -124,13 +133,24 @@ module Zookeeper
     # implementation, but it's more important to get *something* working and
     # passing specs, then refactor to make everything sane
     # 
+    #
     def submit(czk)
+      state = czk.zkrb_state    # check the state of the connection
+
+      if @meth == :state        # if the method is a state call
+        @rval = [state]         # we're done, no error
+        return deliver!
+
+      elsif state != ZOO_CONNECTED_STATE  # otherwise, we must be connected
+        @error = state                    # so set the error
+        return deliver!                   # and we're out
+      end
+
       rc, *_ = czk.__send__(:"zkrb_#{@meth}", *async_args)
       
-      # if this is an state call, async call, or we failed to submit it
-      if (@meth == :state) or user_callback? or (rc != ZOK)
-        @rval = [rc]           # create the repsonse
-        deliver!               # wake the caller and we're out
+      if user_callback? or (rc != ZOK)  # async call, or we failed to submit it
+        @rval = [rc]                    # create the repsonse
+        deliver!                        # wake the caller and we're out
       end
     end
 
@@ -152,9 +172,6 @@ module Zookeeper
 
         logger.debug { "async_args, meth: #{meth} ary: #{ary.inspect}, #{callback_arg_idx}" }
 
-        # this is not already an async call
-        # so we replace the req_id with the ZKRB_ASYNC_CONTN_ID so the 
-        # event thread knows to dispatch it itself
         ary[callback_arg_idx] ||= self
 
         ary
@@ -165,11 +182,8 @@ module Zookeeper
       end
 
       def deliver!
-        @mutex.lock
-        begin
+        @mutex.synchronize do
           @cond.signal
-        ensure
-          @mutex.unlock rescue nil
         end
       end
   end # Base

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports