zk 1.4.0 → 1.4.1

data/Gemfile

@@ -8,7 +8,7 @@ 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/00000' do
+# git 'git://github.com/slyphon/zookeeper.git', :tag => 'dev/zk/00001' do
 #   gem 'zookeeper', '~> 1.0.0'
 # end
 

data/README.markdown

@@ -66,6 +66,10 @@ In addition to all of that, I would like to think that the public API the ZK::Cl
 
 ## NEWS ##
 
+### v1.4.1 ###
+
+* All users of resque or other libraries that depend on `fork()` are encouraged to upgrade immediately. This version of ZK features the `zookeeper-1.1.0` gem with a completely rewritten backend that provides true fork safety. The rules still apply (you must call `#reopen` on your client as soon as possible in the child process) but you can be assured a much more stable experience.
+
 ### v1.4.0 ###
 
 * Added a new `:ignore` option for convenience when you don't care if an operation fails. In the case of a failure, the method will return nil instead of raising an exception. This option works for `children`, `create`, `delete`, `get`, `get_acl`, `set`, and `set_acl`. `stat` will ignore the option (because it doesn't care about the state of a node).

data/RELEASES.markdown

@@ -1,5 +1,10 @@
 This file notes feature differences and bugfixes contained between releases. 
 
+### v1.4.1 ###
+
+* True fork safety! The `zookeeper` at 1.1.0 is finally fork-safe. You can now use ZK in whatever forking library you want. Just remember to call `#reopen` on your client instance in the child process before attempting any opersations.
+
+
 ### v1.4.0 ###
 
 * Added a new `:ignore` option for convenience when you don't care if an operation fails. In the case of a failure, the method will return nil instead of raising an exception. This option works for `children`, `create`, `delete`, `get`, `get_acl`, `set`, and `set_acl`. `stat` will ignore the option (because it doesn't care about the state of a node).

data/lib/zk/version.rb

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

data/spec/spec_helper.rb

@@ -32,6 +32,14 @@ RSpec.configure do |config|
     config.extend(mod)
   end
 
+  if ZK.rubinius?
+    config.filter_run_excluding :rbx => :broken
+  end
+
+  if ZK.jruby?
+    config.filter_run_excluding :fork_required => true
+  end
+
   if ZK.spawn_zookeeper?
     require 'zk-server'
 

data/spec/zk/client_spec.rb

@@ -32,158 +32,153 @@ describe ZK::Client::Threaded do
     end
   end
 
-  unless defined?(::JRUBY_VERSION)
-    describe :forked do
-      include_context 'connection opts'
+  describe :forked, :fork_required => true, :rbx => :broken do
+    include_context 'connection opts'
 
-      before do
-        @base_path = '/zktests'
-        @pids_root = "#{@base_path}/pid"
+    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
+      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
+    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
-
-        @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
-#         pending_in_travis "skip this test, flaky in travis"
-        pending_rbx('fails in rubinius')
-        
-        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
+      @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)
+      @parent_pid = $$
+      
+      @zk.create("#{@pids_root}/#{$$}", $$.to_s)
 
-        event_catcher = EventCatcher.new
+      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
+      @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
+      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
+      @pid = fork do
+        @zk.reopen
+        @zk.wait_until_connected
 
-          child_pid_path = "#{@pids_root}/#{$$}"
+        child_pid_path = "#{@pids_root}/#{$$}"
 
-          create_latch = Zookeeper::Latch.new
+        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
+        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
+        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" }
+        logger.debug { "now testing for delete event totally created in child" }
 
-          delete_latch = Zookeeper::Latch.new
+        delete_latch = Zookeeper::Latch.new
 
-          delete_event = nil
+        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
+        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.exists?(child_pid_path, :watch => true)
 
-          @zk.delete(child_pid_path)
+        @zk.delete(child_pid_path)
 
-          logger.debug { "awaiting deletion event notification" }
-          delete_latch.await unless delete_event
+        logger.debug { "awaiting deletion event notification" }
+        delete_latch.await unless delete_event
 
-          logger.debug { "deletion event: #{delete_event}" }
+        logger.debug { "deletion event: #{delete_event}" }
 
-          if delete_event
-            exit! 0
-          else
-            exit! 1
-          end
+        if delete_event
+          exit! 0
+        else
+          exit! 1
         end
+      end
 
-        # replicates deletion watcher inside child
-        child_pid_path = "#{@pids_root}/#{@pid}"
+      # replicates deletion watcher inside child
+      child_pid_path = "#{@pids_root}/#{@pid}"
 
-        delete_latch = Latch.new
+      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_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
-          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
+      end
 
-        delete_latch.await if @zk.exists?(child_pid_path, :watch => true)
+      delete_latch.await if @zk.exists?(child_pid_path, :watch => true)
 
-        _, stat = Process.wait2(@pid)
+      _, stat = Process.wait2(@pid)
 
-        stat.should_not be_signaled
-        stat.should be_exited
-        stat.should be_success
+      stat.should_not be_signaled
+      stat.should be_exited
+      stat.should be_success
 
 
-      end # should deliver callbacks in the child
-    end # forked
-  end # # jruby guard
+    end # should deliver callbacks in the child
+  end # forked
 end # ZK::Client::Threaded
 

data/spec/zk/pool_spec.rb

@@ -155,7 +155,7 @@ describe ZK::Pool do
     # These tests are seriously yucky, but they show that when a client is !connected?
     # the pool behaves properly and will not return that client to the caller.
     
-    describe 'health checking with disconnected client' do
+    describe 'health checking with disconnected client', :rbx => :broken do
       before do
         wait_until(2) { @connection_pool.available_size == 2 }
         @connection_pool.available_size.should == 2
@@ -196,7 +196,6 @@ describe ZK::Pool do
         @connections.should include(@mcnx1)
       end
     end
-
   end # Simple
 
   describe :Bounded do

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.0.3'
+  s.add_runtime_dependency 'zookeeper', '~> 1.1.0'
   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: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zookeeper
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 19
         segments: 
         - 1
+        - 1
         - 0
-        - 3
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency