zk 0.8.9 → 0.9.0

data/spec/z_k/client/multiplexed_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'ZK::Client::Multiplexed', :client => :multiplexed do
+  before do
+    @zk = ZK::Client::Multiplexed.new("localhost:#{ZK_TEST_PORT}").tap do |zk|
+      wait_until { zk.connected? }
+    end
+
+    @zk.rm_rf('/test')
+  end
+
+  after do
+    @zk.rm_rf('/test')
+    @zk.close!
+
+    wait_until(2) { @zk.closed? }
+  end
+
+  it_should_behave_like 'client'
+end

data/spec/z_k/client_spec.rb

@@ -1,235 +1,7 @@
 require 'spec_helper'
 
-describe ZK::Client do
-  before do
-    @connection_string = "localhost:#{ZK_TEST_PORT}"
-    @zk = ZK.new(@connection_string)
-    wait_until{ @zk.connected? }
-    @zk.rm_rf('/test')
-  end
-
-  after do
-    @zk.rm_rf('/test')
-    @zk.close!
-
-    wait_until(2) { @zk.closed? }
-  end
-
-  describe :mkdir_p do
-    before(:each) do
-      @path_ary = %w[test mkdir_p path creation]
-      @bogus_path = File.join('/', *@path_ary)
-    end
-    
-    it %[should create all intermediate paths for the path givem] do
-      @zk.should_not be_exists(@bogus_path)
-      @zk.should_not be_exists(File.dirname(@bogus_path))
-      @zk.mkdir_p(@bogus_path)
-      @zk.should be_exists(@bogus_path)
-    end
-  end
-
-  describe :stat do
-    describe 'for a missing node' do
-      before do
-        @missing_path = '/thispathdoesnotexist'
-        @zk.delete(@missing_path) rescue ZK::Exceptions::NoNode
-      end
-
-      it %[should not raise any error] do
-        lambda { @zk.stat(@missing_path) }.should_not raise_error
-      end
-
-      it %[should return a Stat object] do
-        @zk.stat(@missing_path).should be_kind_of(ZookeeperStat::Stat)
-      end
-
-      it %[should return a stat that not exists?] do
-        @zk.stat(@missing_path).should_not be_exists
-      end
-    end
-  end
-
-  describe :block_until_node_deleted do
-    before do
-      @path = '/_bogualkjdhsna'
-    end
-
-    describe 'no node initially' do
-      before do
-        @zk.exists?(@path).should be_false
-      end
-
-      it %[should not block] do
-        @a = false
-
-        th = Thread.new do
-          @zk.block_until_node_deleted(@path)
-          @a = true
-        end
-
-        th.join(2)
-        @a.should be_true
-      end
-    end
-
-    describe 'node exists initially' do
-      before do
-        @zk.create(@path, '', :mode => :ephemeral)
-        @zk.exists?(@path).should be_true
-      end
-
-      it %[should block until the node is deleted] do
-        @a = false
-
-        th = Thread.new do
-          
-          @zk.block_until_node_deleted(@path)
-          @a = true
-        end
-
-        Thread.pass
-        @a.should be_false
-
-        @zk.delete(@path)
-
-        wait_until(2) { @a }
-        @a.should be_true
-      end
-
-      shared_examples_for 'session death' do
-        def deliver_session_event_to(event_num, zk)
-          # jeez, Zookeeper callbacks are so frustratingly stupid
-          bogus_event = ZookeeperCallbacks::WatcherCallback.new
-          bogus_event.initialize_context(:type => -1, :state => event_num, :path => '', :context => 'bogustestevent')
-          # XXX: this is bad because we're in the wrong thread, but we'll fix this after the next Zookeeper release
-          zk.event_handler.process(bogus_event)
-        end
-
-        before do
-          @other_zk = ZK.new(@connection_string)
-        end
-
-        after do
-          @other_zk.close! unless @other_zk.closed?
-        end
-
-        it %[should wake up in the case of an expired session and throw an exception] do
-          @a = false
-
-          @other_zk.event_handler.register_state_handler(zoo_state) do |event|
-            @a = event
-          end
-
-          th = Thread.new do
-            @other_zk.block_until_node_deleted(@path)
-          end
-
-          wait_until(2) { th.status == 'sleep' }
-
-          # not on the other thread, this may be bad
-          deliver_session_event_to(zoo_state, @other_zk)
-
-          # ditto, this is probably happening synchrnously
-          wait_until(2) { @a }
-
-          lambda { th.join(2) }.should raise_error(zoo_error_class)
-        end
-      end
-
-      describe 'exceptional conditions' do
-        describe 'ZOO_EXPIRED_SESSION_STATE' do
-          let(:zoo_state) { ZookeeperConstants::ZOO_EXPIRED_SESSION_STATE }
-          let(:zoo_error_class) { ZookeeperExceptions::ZookeeperException::SessionExpired }
-
-          it_behaves_like 'session death'
-        end
-
-        describe 'ZOO_CONNECTING_STATE' do
-          let(:zoo_state) { ZookeeperConstants::ZOO_CONNECTING_STATE }
-          let(:zoo_error_class) { ZookeeperExceptions::ZookeeperException::NotConnected }
-
-          it_behaves_like 'session death'
-        end
-
-        describe 'ZOO_CLOSED_STATE' do
-          let(:zoo_state) { ZookeeperConstants::ZOO_CLOSED_STATE }
-          let(:zoo_error_class) { ZookeeperExceptions::ZookeeperException::ConnectionClosed }
-
-          it_behaves_like 'session death'
-        end
-      end
-    end
-  end
-
-  describe 'session_id and session_passwd' do
-    it %[should expose the underlying session_id] do
-      @zk.session_id.should be_kind_of(Fixnum)
-    end
-
-    it %[should expose the underlying session_passwd] do
-      @zk.session_passwd.should be_kind_of(String)
-    end
-  end
-
-  describe 'reopen' do
-    describe 'watchers' do
-      before do
-        @path = '/testwatchers'
-        @queue = Queue.new
-      end
-
-      after do
-        @zk.delete(@path)
-      end
-
-      def ensure_event_delivery!
-        @sub ||= @zk.event_handler.register(@path) do |event|
-          logger.debug { "got event: #{event.inspect}" } 
-          @queue << event
-        end
-
-        @zk.exists?(@path, :watch => true).should be_false
-        @zk.create(@path, '')
-
-        logger.debug { "waiting for event delivery" } 
-
-        wait_until(2) do 
-          begin
-            @events << @queue.pop(true)
-            true
-          rescue ThreadError
-            false
-          end
-        end
-
-        # first watch delivered correctly
-        @events.length.should > 0
-      end
-
-      it %[should fire re-registered watchers after reopen (#9)] do
-        @events = []
-
-        logger.debug { "ensure event delivery" }
-        ensure_event_delivery!
-
-        logger.debug { "reopening connection" }
-        @zk.reopen
-
-        wait_until(2) { @zk.connected? }
-
-        logger.debug { "deleting path" }
-        @zk.delete(@path)
-
-        logger.debug { "clearing events" }
-        @events.clear
-
-        logger.debug  { "taunt them a second time" }
-        ensure_event_delivery!
-      end
-    end
-  end
+describe ZK::Client::Threaded do
+  include_context 'threaded client connection'
+  it_should_behave_like 'client'
 end
 
-
-

data/spec/z_k/election_spec.rb

@@ -162,21 +162,22 @@ describe ZK::Election do
             @obama.zk.close!
             wait_until { @palin_won }
 
-            zk = ZK.new('localhost:2181')
-            newbama = ZK::Election::Candidate.new(zk, @election_name, :data => @data1)
+            ZK.open('localhost:2181') do |zk|
+              newbama = ZK::Election::Candidate.new(zk, @election_name, :data => @data1)
 
-            win_again = false
+              win_again = false
 
-            newbama.on_winning_election do
-              win_again = true
-            end
+              newbama.on_winning_election do
+                win_again = true
+              end
 
-            newbama.vote!
-            wait_until { newbama.voted? }
+              newbama.vote!
+              wait_until { newbama.voted? }
 
-            newbama.should be_voted
-            win_again.should be_false
-            newbama.should_not be_leader
+              newbama.should be_voted
+              win_again.should be_false
+              newbama.should_not be_leader
+            end
           end
         end
       end

data/spec/z_k/locker_spec.rb

@@ -72,8 +72,47 @@ describe 'ZK::Client#locker' do
     thread.join(10)
     array.length.should == 2
   end
+
 end
 
+# describe 'Locker thread safety' do
+#   describe 'exception' do
+#     before do
+#       @path = '/zk_test'
+#       @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
+#       @zk.create(@path) rescue ZK::Exceptions::NodeExists
+#     end
+
+#     after do
+#       @zk.rm_rf(@path)
+#       @zk.close!
+#     end
+
+#     it %[should raise an EventDispatchThreadException if called in the dispatch thread] do
+#       @exception = nil
+
+#       @zk.register(@path) do |event|
+#         @zk.event_dispatch_thread?.should be_true
+
+#         begin
+#           @zk.with_lock('boguslockname') do
+#             raise "Should never have gotten this far"
+#           end
+#         rescue Exception => e
+#           @exception = e
+#         end
+#       end
+
+#       @zk.exists?(@path, :watch => true)
+
+#       @zk.set(@path, 'blah')
+
+#       wait_until(2) { @exception }.should be_kind_of(ZK::Exceptions::EventDispatchThreadException)
+#     end
+#   end
+
+# end
+
 shared_examples_for 'SharedLocker' do
   before do
     @shared_locker  = ZK::Locker.shared_locker(zk, path)
@@ -207,6 +246,7 @@ shared_examples_for 'ExclusiveLocker' do
         @ex_locker.should be_locked
       end
     end
+
   end
 end # ExclusiveLocker
 
@@ -366,8 +406,8 @@ end # shared-exclusive interaction
 
 
 describe ZK::Locker do
-  let(:zk)  { ZK.new("localhost:#{ZK_TEST_PORT}", :watcher => :default) }
-  let(:zk2) { ZK.new("localhost:#{ZK_TEST_PORT}", :watcher => :default) }
+  let(:zk)  { ZK.new("localhost:#{ZK_TEST_PORT}") }
+  let(:zk2) { ZK.new("localhost:#{ZK_TEST_PORT}") }
   let(:zk3) { ZK.new("localhost:#{ZK_TEST_PORT}") }
 
   let(:connections) { [zk, zk2, zk3] }
@@ -437,9 +477,35 @@ describe "ZK::Locker chrooted" do
         end
       end.should raise_error(ZK::Exceptions::NonExistentRootError)
 
-
       @got_lock.should_not be_true
     end
   end
 end
 
+describe 'ZK::Locker Multiplexed client', :client => :multiplexed do
+  let(:zk)  { ZK::Client::Multiplexed.new("localhost:#{ZK_TEST_PORT}") }
+  let(:zk2) { ZK::Client::Multiplexed.new("localhost:#{ZK_TEST_PORT}") }
+  let(:zk3) { ZK::Client::Multiplexed.new("localhost:#{ZK_TEST_PORT}") }
+
+  let(:connections) { [zk, zk2, zk3] }
+
+  let(:path) { "shlock" }
+  let(:root_lock_path) { "/_zklocking/#{path}" }
+
+  before do
+    wait_until{ connections.all?(&:connected?) }
+    pending "Mutliplexed client locking is broken"
+  end
+
+  after do
+    connections.each { |c| c.close! }
+    wait_until { !connections.any?(&:connected?) }
+  end
+
+  it_should_behave_like 'SharedLocker'
+  it_should_behave_like 'ExclusiveLocker'
+  it_should_behave_like 'shared-exclusive interaction'
+end # ZK::Locker
+
+
+

data/spec/zookeeper_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), %w[spec_helper])
 
 describe ZK do
   before do
-    @zk = ZK.new("localhost:#{ZK_TEST_PORT}", :watcher => nil)
+    @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
 
     @base_path = "/zktests"
     @zk.rm_rf(@base_path)
@@ -48,7 +48,7 @@ describe ZK do
       wait_until(2) { !@zk.connected? }
       @zk.should_not be_connected
 
-      @zk = ZK.new("localhost:#{ZK_TEST_PORT}", :watcher => nil)
+      @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
       wait_until{ @zk.connected? }
       @zk.exists?("#{@base_path}/test").should be_false
     end
@@ -59,7 +59,7 @@ describe ZK do
       @zk.exists?(created).should_not be_nil
       @zk.close!
 
-      @zk = ZK.new("localhost:#{ZK_TEST_PORT}", :watcher => nil)
+      @zk = ZK.new("localhost:#{ZK_TEST_PORT}")
       wait_until{ @zk.connected? }
       @zk.exists?(created).should be_false
     end

data/zk.gemspec

@@ -12,8 +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 'slyphon-zookeeper', '~> 0.3.0'
-
+  s.add_runtime_dependency 'slyphon-zookeeper', '~> 0.8.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
   - 9
-  version: 0.8.9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 61
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id001
 description: |
@@ -55,11 +55,15 @@ files:
 - Gemfile
 - LICENSE
 - README.markdown
+- RELEASES.markdown
 - Rakefile
 - lib/z_k.rb
 - lib/z_k/client.rb
 - lib/z_k/client/base.rb
+- lib/z_k/client/continuation_proxy.rb
 - lib/z_k/client/conveniences.rb
+- lib/z_k/client/drop_box.rb
+- lib/z_k/client/multiplexed.rb
 - lib/z_k/client/state_mixin.rb
 - lib/z_k/client/threaded.rb
 - lib/z_k/client/unixisms.rb
@@ -80,12 +84,20 @@ files:
 - spec/informal/lock_with_dead_session.rb
 - spec/log4j.properties
 - spec/message_queue_spec.rb
+- spec/shared/client_contexts.rb
+- spec/shared/client_examples.rb
 - spec/spec_helper.rb
 - spec/support/bogus_mongoid.rb
+- spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
 - spec/support/queuey_thread.rb
+- spec/support/special_happy_funtime_error.rb
+- spec/support/wait_watchers.rb
 - spec/test_file.txt
 - spec/watch_spec.rb
+- spec/z_k/client/drop_box_spec.rb
+- spec/z_k/client/locking_and_session_death_spec.rb
+- spec/z_k/client/multiplexed_spec.rb
 - spec/z_k/client_spec.rb
 - spec/z_k/election_spec.rb
 - spec/z_k/extensions_spec.rb
@@ -132,12 +144,20 @@ test_files:
 - spec/informal/lock_with_dead_session.rb
 - spec/log4j.properties
 - spec/message_queue_spec.rb
+- spec/shared/client_contexts.rb
+- spec/shared/client_examples.rb
 - spec/spec_helper.rb
 - spec/support/bogus_mongoid.rb
+- spec/support/logging.rb
 - spec/support/logging_progress_bar_formatter.rb
 - spec/support/queuey_thread.rb
+- spec/support/special_happy_funtime_error.rb
+- spec/support/wait_watchers.rb
 - spec/test_file.txt
 - spec/watch_spec.rb
+- spec/z_k/client/drop_box_spec.rb
+- spec/z_k/client/locking_and_session_death_spec.rb
+- spec/z_k/client/multiplexed_spec.rb
 - spec/z_k/client_spec.rb
 - spec/z_k/election_spec.rb
 - spec/z_k/extensions_spec.rb