zk 1.9.0 → 1.9.1

data/RELEASES.markdown

@@ -1,5 +1,11 @@
 This file notes feature differences and bugfixes contained between releases.
 
+### v1.9.1 ###
+
+* Fix re-rewatchind children watchers after the parent znode was deleted #68
+* Deal with reopening a closed connection properly #70
+
+
 ### v1.9.0 ###
 
 * Semaphores!

data/Rakefile

@@ -38,7 +38,7 @@ if File.exists?(release_ops_path)
           cd tmpdir do
             sh "git co #{tag} && git reset --hard && git clean -fdx"
 
-            sh "rvm 1.8.7 do gem build zk.gemspec"
+            sh "gem build zk.gemspec"
 
             mv FileList['*.gem'], orig_dir
           end

data/lib/zk/client/threaded.rb

@@ -245,6 +245,8 @@ module ZK
             logger.debug { "reopening, no fork detected" }
             @last_cnx_state = Zookeeper::ZOO_CONNECTING_STATE
             
+            @client_state  = RUNNING # reset state to running if we were paused or closed
+
             timeout ||= @connection_timeout     # or @connection_timeout here is the docuemnted behavior on Base#reopen
 
             @cnx.reopen(timeout)                # ok, we werent' forked, so just reopen

data/lib/zk/event_handler.rb

@@ -17,14 +17,6 @@ module ZK
     # @private
     ALL_STATE_EVENTS_KEY = :all_state_events
 
-    # @private
-    ZOOKEEPER_WATCH_TYPE_MAP = {
-      Zookeeper::ZOO_CREATED_EVENT => :data,
-      Zookeeper::ZOO_DELETED_EVENT => :data,
-      Zookeeper::ZOO_CHANGED_EVENT => :data,
-      Zookeeper::ZOO_CHILD_EVENT   => :child,
-    }.freeze
-
     # @private
     VALID_THREAD_OPTS = [:single, :per_callback].freeze
 
@@ -157,10 +149,10 @@ module ZK
     #   and session events go through here, NOT anything else!!
     #
     # @private
-    def process(event)
+    def process(event, watch_type = nil)
       @zk.raw_event_handler(event)
 
-      logger.debug { "EventHandler#process dispatching event: #{event.inspect}" }# unless event.type == -1
+      logger.debug { "EventHandler#process dispatching event for #{watch_type.inspect}: #{event.inspect}" }# unless event.type == -1
       event.zk = @zk
 
       cb_keys = 
@@ -173,7 +165,7 @@ module ZK
         end
 
       cb_ary = synchronize do 
-        clear_watch_restrictions(event)
+        clear_watch_restrictions(event, watch_type)
 
         @callbacks.values_at(*cb_keys)
       end
@@ -193,11 +185,11 @@ module ZK
     # happens inside the lock, clears the restriction on setting new watches
     # for a given path/event type combination
     #
-    def clear_watch_restrictions(event)
+    def clear_watch_restrictions(event, watch_type)
       return unless event.node_event?
 
-      if watch_type = ZOOKEEPER_WATCH_TYPE_MAP[event.type]
-        #logger.debug { "re-allowing #{watch_type.inspect} watches on path #{event.path.inspect}" }
+      if watch_type
+        logger.debug { "re-allowing #{watch_type.inspect} watches on path #{event.path.inspect}" }
         
         # we recieved a watch event for this path, now we allow code to set new watchers
         @outstanding_watches[watch_type].delete(event.path)
@@ -286,11 +278,13 @@ module ZK
         path = opts[:path]
 
         if set.add?(path)
+          logger.debug { "adding watcher #{watch_type.inspect} for #{path.inspect}"}
+
           # if we added the path to the set, blocking further registration of
           # watches and an exception is raised then we rollback
           begin
             # this path has no outstanding watchers, let it do its thing
-            opts[:watcher] = watcher_callback 
+            opts[:watcher] = watcher_callback(watch_type)
 
             yield opts
           rescue Exception
@@ -298,6 +292,8 @@ module ZK
             raise
           end
         else
+          logger.debug { "watcher #{watch_type.inspect} already set for #{path.inspect}"}
+
           # we did not add the path to the set, which means we are not
           # responsible for removing a block on further adds if the operation
           # fails, therefore, we just yield
@@ -311,8 +307,8 @@ module ZK
         @mutex.synchronize { yield }
       end
 
-      def watcher_callback
-        Zookeeper::Callbacks::WatcherCallback.create { |event| process(event) }
+      def watcher_callback(watch_type = nil)
+        Zookeeper::Callbacks::WatcherCallback.create { |event| process(event, watch_type) }
       end
 
       def state_key(arg)

data/lib/zk/message_queue.rb

@@ -47,7 +47,7 @@ module ZK
         message_title = "message"
       end
       @zk.create("#{full_queue_path}/#{message_title}", data, :mode => mode)
-    rescue KeeperException::NodeExists
+    rescue ZK::Exceptions::NodeExists
       return false
     end
 

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/spec/zk/client_spec.rb

@@ -36,11 +36,35 @@ describe ZK::Client::Threaded do
 
         shutdown_thread.join(5).should == shutdown_thread
 
-        wait_until(5) { @zk.closed? }.should be_true 
+        wait_until(5) { @zk.closed? }.should be_true
       end
     end
   end
 
+  describe :reopen do
+    include_context 'connection opts'
+
+    before do
+      @zk = ZK::Client::Threaded.new(*connection_args)
+    end
+
+    after do
+      @zk.close! unless @zk.closed?
+    end
+
+    it %[should say the client is connected after reopen] do
+      @zk.connected?.should == true
+
+      @zk.close!
+
+      @zk.connected?.should == false
+
+      @zk.reopen
+
+      @zk.connected?.should == true
+    end
+  end
+
   describe :retry do
     include_context 'connection opts'
 
@@ -54,8 +78,8 @@ describe ZK::Client::Threaded do
 
     it %[should retry a Retryable operation] do
       # TODO: this is a terrible test. there is no way to guarantee that this
-      #       has been retried. the join at the end should not raise an error 
-      
+      #       has been retried. the join at the end should not raise an error
+
       @zk.should_not be_connected
 
       th = Thread.new do

data/spec/zk/watch_spec.rb

@@ -156,6 +156,52 @@ describe ZK do
       events.should_not be_empty
     end
 
+    it %[should call a child listener when the node is deleted] do
+      events = []
+
+      sub = @zk.register(@path) do |ev|
+        logger.debug { "got event #{ev}" }
+        events << ev
+      end
+
+      @zk.create(@path, '')
+
+      # Watch for children
+      @zk.children(@path, :watch => true)
+
+      # Delete the node
+      @zk.delete(@path)
+
+      # We expect to see a delete event show up
+      wait_while(5) { events.empty? }
+
+      event = events.pop
+
+      event.should_not be_nil
+
+      event.path.should == @path
+      event.type.should == Zookeeper::ZOO_DELETED_EVENT
+
+      # Create the node again
+      @zk.create(@path, '')
+
+      # Watch for children again
+      @zk.children(@path, :watch => true)
+
+      # Delete the node again
+      @zk.delete(@path)
+
+      # We expect to see another delete event show up
+      wait_while(5) { events.empty? }
+
+      event = events.pop
+
+      event.should_not be_nil
+
+      event.path.should == @path
+      event.type.should == Zookeeper::ZOO_DELETED_EVENT
+    end
+
     describe ':all' do
       before do
         mute_logger do

metadata

@@ -1,67 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zk
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 1.9.1
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
 platform: ruby
-authors: 
+authors:
 - Jonathan D. Simms
 - Topper Bowers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: zookeeper
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: logging
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 7
-        - 2
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
-  version_requirements: *id002
-description: |
-  A high-level wrapper around the zookeeper driver
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+description: ! 'A high-level wrapper around the zookeeper driver
 
-email: 
+'
+email:
 - slyphon@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .dotfiles/ctags_paths
 - .dotfiles/rspec-logging
 - .dotfiles/ruby-gemset
@@ -164,38 +155,35 @@ files:
 - zk.gemspec
 homepage: https://github.com/slyphon/zk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1065717701995457844
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1065717701995457844
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A high-level wrapper around the zookeeper driver
-test_files: 
+test_files:
 - spec/event_catcher_spec.rb
 - spec/informal/close-in-event-thread.rb
 - spec/informal/lock_with_dead_session.rb
@@ -240,3 +228,4 @@ test_files:
 - spec/zk/threadpool_spec.rb
 - spec/zk/watch_spec.rb
 - spec/zk/zookeeper_spec.rb
+has_rdoc: