zk 1.4.1 → 1.4.2

data/lib/zk.rb

@@ -225,6 +225,10 @@ module ZK
     ruby_19? and not jruby? or rubinius?
   end
 
+  def self.mri_193?
+    (RUBY_VERSION == '1.9.3') and not jruby? or rubinius?
+  end
+
   def self.ruby_19?
     (RUBY_VERSION =~ /\A1\.9\.[2-9]\Z/)
   end

data/lib/zk/client/base.rb

@@ -135,7 +135,7 @@ module ZK
       # close the underlying connection and clear all pending events.
       #
       def close!
-        event_handler.clear!
+        event_handler.close
         close
       end
 

data/lib/zk/client/threaded.rb

@@ -180,6 +180,7 @@ module ZK
           old_cnx.close! if old_cnx # && !old_cnx.closed?
         else
           logger.debug { "#{self.class}##{__method__} not reopening, no fork detected" }
+          @cnx.reopen(timeout)
         end
 
         @mutex.synchronize { @close_requested = false }

data/lib/zk/event_handler.rb

@@ -231,6 +231,14 @@ module ZK
       end
     end 
 
+    # shut down the EventHandlerSubscriptions 
+    def close
+      synchronize do
+        @callbacks.values.flatten.each(&:close)
+        clear!
+      end
+    end
+
     # @private
     def synchronize
       @mutex.synchronize { yield }

data/lib/zk/event_handler_subscription/actor.rb

@@ -21,6 +21,11 @@ module ZK
       def async?
         true
       end
+
+      # calls unsubscribe and shuts down 
+      def close
+        unsubscribe
+      end
     end
   end
 end

data/lib/zk/event_handler_subscription/base.rb

@@ -39,6 +39,10 @@ module ZK
         false
       end
 
+      # take any action to free resources associated with this subscription
+      def close
+      end
+
       protected
         def prep_interests(a)
 #           logger.debug { "prep_interests: #{a.inspect}" }

data/lib/zk/subscription.rb

@@ -23,8 +23,15 @@ module ZK
         reopen_after_fork!
       end
 
+      def unregistered?
+        @parent.nil?
+      end
+
+      # calls unregister on parent, then sets parent to nil
       def unregister
-        parent.unregister(self)
+        return false unless @parent
+        @parent.unregister(self)
+        @parent = nil
       end
       alias unsubscribe unregister
 
@@ -55,7 +62,7 @@ module ZK
 
       def unsubscribe_with_threaded_callback
         synchronize do
-          @threaded_callback.shutdown
+          @threaded_callback && @threaded_callback.shutdown
           unsubscribe_without_threaded_callback
         end
       end

data/lib/zk/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ RSpec.configure do |config|
     config.filter_run_excluding :rbx => :broken
   end
 
-  if ZK.jruby?
+  if ZK.jruby? or not ZK.mri_193?
     config.filter_run_excluding :fork_required => true
   end
 

data/spec/support/client_forker.rb

@@ -0,0 +1,159 @@
+class ClientForker
+  include ZK::Logging
+  attr_reader :base_path, :cnx_args, :stat
+
+  def self.run(cnx_args, base_path)
+    cf = new(cnx_args, base_path)
+    cf.run
+    yield cf
+  end
+
+  def initialize(cnx_args, base_path)
+    @cnx_args  = cnx_args
+    @base_path = base_path
+    @pids_root = "#{@base_path}/pid"
+  end
+
+  def before
+    ZK.open(*cnx_args) do |z|
+      z.rm_rf(@base_path)
+      z.mkdir_p(@pids_root)
+    end
+  end
+
+  def tear_down
+    @zk.rm_rf(@base_path)
+    @zk.close! unless @zk.closed?
+  end
+
+  def kill_child!
+    return unless @pid
+    Process.kill('TERM', @pid)
+    pid, st = Process.wait2(@pid)
+    logger.debug { "child #{@pid} exited with status: #{st.inspect}" }
+  rescue Errno::ESRCH
+  end
+
+  def run
+    before
+
+    logger.debug { "Process.pid of parent: #{Process.pid}" }
+
+    @zk = ZK.new(*cnx_args) do |z|
+      z.on_connected do
+        logger.debug { "on_connected fired, writing pid to path #{@pids_root}/#{$$}" }
+        begin
+          z.create("#{@pids_root}/#{Process.pid}", Process.pid.to_s)
+        rescue ZK::Exceptions::NodeExists
+        end
+      end
+    end
+
+    @parent_pid = $$
+    
+    @zk.create("#{@pids_root}/#{$$}", $$.to_s)
+
+    event_catcher = EventCatcher.new
+
+    @zk.register(@pids_root) do |event|
+      if event.node_child?
+        event_catcher << event
+      else
+        @zk.children(@pids_root, :watch => true)
+      end
+    end
+
+    logger.debug { "parent watching for children on #{@pids_root}" }
+    @zk.children(@pids_root, :watch => true)  # side-effect, register watch
+
+    @pid = fork do
+      @zk.reopen
+      @zk.wait_until_connected
+
+      child_pid_path = "#{@pids_root}/#{$$}"
+
+      create_latch = Zookeeper::Latch.new
+
+      create_sub = @zk.register(child_pid_path) do |event|
+        if event.node_created?
+          logger.debug { "got created event, releasing create_latch" }
+          create_latch.release
+        else
+          if @zk.exists?(child_pid_path, :watch => true)
+            logger.debug { "created behind our backs, releasing create_latch" }
+            create_latch.release 
+          end
+        end
+      end
+
+      if @zk.exists?(child_pid_path, :watch => true)
+        logger.debug { "woot! #{child_pid_path} exists!" }
+        create_sub.unregister
+      else
+        logger.debug { "awaiting the create_latch to release" }
+        create_latch.await
+      end
+
+      logger.debug { "now testing for delete event totally created in child" }
+
+      delete_latch = Zookeeper::Latch.new
+
+      delete_event = nil
+
+      delete_sub = @zk.register(child_pid_path) do |event|
+        if event.node_deleted?
+          delete_event = event
+          logger.debug { "child got delete event on #{child_pid_path}" }
+          delete_latch.release
+        else
+          unless @zk.exists?(child_pid_path, :watch => true)
+            logger.debug { "child: someone deleted #{child_pid_path} behind our back" }
+            delete_latch.release 
+          end
+        end
+      end
+
+      @zk.exists?(child_pid_path, :watch => true)
+
+      @zk.delete(child_pid_path)
+
+      logger.debug { "awaiting deletion event notification" }
+      delete_latch.await unless delete_event
+
+      logger.debug { "deletion event: #{delete_event}" }
+
+      if delete_event
+        exit! 0
+      else
+        exit! 1
+      end
+    end # forked child
+
+    # replicates deletion watcher inside child
+    child_pid_path = "#{@pids_root}/#{@pid}"
+
+    delete_latch = Latch.new
+
+    delete_sub = @zk.register(child_pid_path) do |event|
+      if event.node_deleted?
+        logger.debug { "parent got delete event on #{child_pid_path}" }
+        delete_latch.release
+      else
+        unless @zk.exists?(child_pid_path, :watch => true)
+          logger.debug { "child: someone deleted #{child_pid_path} behind our back" }
+          delete_latch.release
+        end
+      end
+    end
+
+    delete_latch.await if @zk.exists?(child_pid_path, :watch => true)
+
+    _, @stat = Process.wait2(@pid)
+
+#     $stderr.puts "#{@pid} exited with status: #{stat.inspect}"
+  ensure
+    kill_child!
+    tear_down
+  end
+end
+

data/spec/zk/00_forked_client_integration_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'forked client integration' do
+  describe :forked, :fork_required => true, :rbx => :broken do
+    include_context 'connection opts'
+
+    before do
+      @base_path = '/zktests'
+      @pids_root = "#{@base_path}/pid"
+      
+      @cnx_args = ["#{ZK.default_host}:#{ZK.test_port}", { :thread => :single, :timeout => 5 }]
+
+      ZK.open(*@cnx_args) do |z|
+        z.rm_rf(@base_path)
+        z.mkdir_p(@pids_root)
+      end
+    end
+
+    after do
+      ZK.open(*connection_args) { |z| z.rm_rf(@base_path) }
+    end
+
+    it %[should deliver callbacks in the child] do
+      10.times do 
+        ClientForker.run(@cnx_args, @base_path) do |forker|
+          forker.stat.should_not be_signaled
+          forker.stat.should be_exited
+          forker.stat.should be_success
+        end
+      end
+    end # should deliver callbacks in the child
+  end # forked
+end
+

data/spec/zk/client_spec.rb

@@ -31,154 +31,5 @@ describe ZK::Client::Threaded do
       end
     end
   end
-
-  describe :forked, :fork_required => true, :rbx => :broken do
-    include_context 'connection opts'
-
-    before do
-      @base_path = '/zktests'
-      @pids_root = "#{@base_path}/pid"
-
-      ZK.open(*connection_args) do |z| 
-        z.rm_rf(@base_path)
-        z.mkdir_p(@pids_root)
-      end
-    end
-
-    after do
-      if @pid
-        begin
-          Process.kill('TERM', @pid)
-          pid, st = Process.wait2(@pid)
-          logger.debug { "child #{@pid} exited with status: #{st.inspect}" }
-        rescue Errno::ESRCH
-        end
-      end
-
-      @zk.close! if @zk
-      ZK.open(*connection_args) { |z| z.rm_rf(@base_path) }
-    end
-
-    it %[should deliver callbacks in the child], :fork => true do
-      logger.debug { "Process.pid of parent: #{Process.pid}" }
-
-      @zk = ZK.new do |z|
-        z.on_connected do
-          logger.debug { "on_connected fired, writing pid to path #{@pids_root}/#{$$}" }
-          begin
-            z.create("#{@pids_root}/#{Process.pid}", Process.pid.to_s)
-          rescue ZK::Exceptions::NodeExists
-          end
-        end
-      end
-
-      @parent_pid = $$
-      
-      @zk.create("#{@pids_root}/#{$$}", $$.to_s)
-
-      event_catcher = EventCatcher.new
-
-      @zk.register(@pids_root) do |event|
-        if event.node_child?
-          event_catcher << event
-        else
-          @zk.children(@pids_root, :watch => true)
-        end
-      end
-
-      logger.debug { "parent watching for children on #{@pids_root}" }
-      @zk.children(@pids_root, :watch => true)  # side-effect, register watch
-
-      @pid = fork do
-        @zk.reopen
-        @zk.wait_until_connected
-
-        child_pid_path = "#{@pids_root}/#{$$}"
-
-        create_latch = Zookeeper::Latch.new
-
-        create_sub = @zk.register(child_pid_path) do |event|
-          if event.node_created?
-            logger.debug { "got created event, releasing create_latch" }
-            create_latch.release
-          else
-            if @zk.exists?(child_pid_path, :watch => true)
-              logger.debug { "created behind our backs, releasing create_latch" }
-              create_latch.release 
-            end
-          end
-        end
-
-        if @zk.exists?(child_pid_path, :watch => true)
-          logger.debug { "woot! #{child_pid_path} exists!" }
-          create_sub.unregister
-        else
-          logger.debug { "awaiting the create_latch to release" }
-          create_latch.await
-        end
-
-        logger.debug { "now testing for delete event totally created in child" }
-
-        delete_latch = Zookeeper::Latch.new
-
-        delete_event = nil
-
-        delete_sub = @zk.register(child_pid_path) do |event|
-          if event.node_deleted?
-            delete_event = event
-            logger.debug { "child got delete event on #{child_pid_path}" }
-            delete_latch.release
-          else
-            unless @zk.exists?(child_pid_path, :watch => true)
-              logger.debug { "child: someone deleted #{child_pid_path} behind our back" }
-              delete_latch.release 
-            end
-          end
-        end
-
-        @zk.exists?(child_pid_path, :watch => true)
-
-        @zk.delete(child_pid_path)
-
-        logger.debug { "awaiting deletion event notification" }
-        delete_latch.await unless delete_event
-
-        logger.debug { "deletion event: #{delete_event}" }
-
-        if delete_event
-          exit! 0
-        else
-          exit! 1
-        end
-      end
-
-      # replicates deletion watcher inside child
-      child_pid_path = "#{@pids_root}/#{@pid}"
-
-      delete_latch = Latch.new
-
-      delete_sub = @zk.register(child_pid_path) do |event|
-        if event.node_deleted?
-          logger.debug { "parent got delete event on #{child_pid_path}" }
-          delete_latch.release
-        else
-          unless @zk.exists?(child_pid_path, :watch => true)
-            logger.debug { "child: someone deleted #{child_pid_path} behind our back" }
-            delete_latch.release
-          end
-        end
-      end
-
-      delete_latch.await if @zk.exists?(child_pid_path, :watch => true)
-
-      _, stat = Process.wait2(@pid)
-
-      stat.should_not be_signaled
-      stat.should be_exited
-      stat.should be_success
-
-
-    end # should deliver callbacks in the child
-  end # forked
 end # ZK::Client::Threaded
 

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.1.0'
+  s.add_runtime_dependency 'zookeeper', '~> 1.1.1'
   s.add_runtime_dependency 'backports', '~> 2.5.1'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zookeeper
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/00_test_port_attr.rb
 - spec/support/bogus_mongoid.rb
+- spec/support/client_forker.rb
 - spec/support/event_catcher.rb
 - spec/support/exist_matcher.rb
 - spec/support/latch.rb
@@ -130,7 +131,7 @@ files:
 - spec/support/special_happy_funtime_error.rb
 - spec/support/wait_watchers.rb
 - spec/test_file.txt
-- spec/watch_spec.rb
+- spec/zk/00_forked_client_integration_spec.rb
 - spec/zk/client/locking_and_session_death_spec.rb
 - spec/zk/client_spec.rb
 - spec/zk/election_spec.rb
@@ -140,7 +141,8 @@ files:
 - spec/zk/mongoid_spec.rb
 - spec/zk/pool_spec.rb
 - spec/zk/threadpool_spec.rb
-- spec/zookeeper_spec.rb
+- spec/zk/watch_spec.rb
+- spec/zk/zookeeper_spec.rb
 - zk.gemspec
 homepage: https://github.com/slyphon/zk
 licenses: []
@@ -171,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A high-level wrapper around the zookeeper driver
@@ -187,6 +189,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/00_test_port_attr.rb
 - spec/support/bogus_mongoid.rb
+- spec/support/client_forker.rb
 - spec/support/event_catcher.rb
 - spec/support/exist_matcher.rb
 - spec/support/latch.rb
@@ -197,7 +200,7 @@ test_files:
 - spec/support/special_happy_funtime_error.rb
 - spec/support/wait_watchers.rb
 - spec/test_file.txt
-- spec/watch_spec.rb
+- spec/zk/00_forked_client_integration_spec.rb
 - spec/zk/client/locking_and_session_death_spec.rb
 - spec/zk/client_spec.rb
 - spec/zk/election_spec.rb
@@ -207,4 +210,5 @@ test_files:
 - spec/zk/mongoid_spec.rb
 - spec/zk/pool_spec.rb
 - spec/zk/threadpool_spec.rb
-- spec/zookeeper_spec.rb
+- spec/zk/watch_spec.rb
+- spec/zk/zookeeper_spec.rb