zk 0.6.5 → 0.7.1

data/spec/{client_pool_spec.rb → z_k/pool_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'spec_helper'
 
 require 'tracer'
 
@@ -57,33 +57,32 @@ describe ZK::Pool do
         @about_to_block = false
 
         open_th = Thread.new do
-          @connection_pool.with_connection do |cnx|
-            @about_to_block = true
-            # wait for signal to release our connection
-            release_q.pop
-          end
+          @cnx = @connection_pool.checkout(true)
+          @about_to_block = true
+          # wait for signal to release our connection
+          release_q.pop
         end
 
-        wait_until(2) { @about_to_block }
+        wait_until(5) { @about_to_block }
         @about_to_block.should be_true
 
-        release_q.num_waiting.should == 1
-
         closing_th = Thread.new do
           @connection_pool.close_all!
         end
 
-        wait_until(2) { @connection_pool.closing? }
+        wait_until(5) { @connection_pool.closing? }
         @connection_pool.should be_closing
+        logger.debug { "connection pool is closing" }
 
         lambda { @connection_pool.with_connection { |c| } }.should raise_error(ZK::Exceptions::PoolIsShuttingDownException)
 
         release_q << :ok_let_go
 
-        open_th.join(2).should == open_th
+        open_th.join(5).should == open_th
+
+        wait_until(5) { @connection_pool.closed? }
+#         $stderr.puts "@connection_pool.pool_state: #{@connection_pool.pool_state.inspect}"
 
-        wait_until(2) { @connection_pool.closed? }
-        $stderr.puts "@connection_pool.pool_state: #{@connection_pool.pool_state.inspect}"
         @connection_pool.should be_closed
 
         lambda do
@@ -107,8 +106,8 @@ describe ZK::Pool do
           @connection_pool.checkout(true)
         end
 
-        th.join_until { @connection_pool.count_waiters > 0 }
-        @connection_pool.count_waiters.should > 0
+        # th.join_until { @connection_pool.count_waiters > 0 }
+        # @connection_pool.count_waiters.should > 0
 
         @connection_pool.force_close!
 
@@ -126,21 +125,21 @@ describe ZK::Pool do
       end
 
       @connection_pool.with_connection do |zk|
-        $stderr.puts "registering callback"
+#         $stderr.puts "registering callback"
         zk.watcher.register(@path) do |event|
-          $stderr.puts "callback fired! event: #{event.inspect}"
+#           $stderr.puts "callback fired! event: #{event.inspect}"
 
           @callback_called = true
           event.path.should == @path
-          $stderr.puts "signaling other waiters"
+#           $stderr.puts "signaling other waiters"
         end
 
-        $stderr.puts "setting up watcher"
+#         $stderr.puts "setting up watcher"
         zk.exists?(@path, :watch => true).should be_false
       end
 
       @connection_pool.with_connection do |zk|
-        $stderr.puts "creating path"
+#         $stderr.puts "creating path"
         zk.create(@path, "", :mode => :ephemeral).should == @path
       end
 
@@ -148,7 +147,53 @@ describe ZK::Pool do
 
       @callback_called.should be_true
     end
-  end # Client
+
+    # 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
+      before do
+        wait_until(2) { @connection_pool.available_size == 2 }
+        @connection_pool.available_size.should == 2
+
+        @connections = @connection_pool.connections
+        @connections.length.should == 2
+
+        @cnx1 = @connections.shift
+
+        mock_sub = flexmock(:subscription)
+
+        @mcnx1 = flexmock(@cnx1) do |m|
+          m.should_receive(:connected?).at_least.once.and_return(false)
+          m.should_receive(:on_connected).with(Proc).at_least.once.and_return(mock_sub)
+        end
+
+        @connections.unshift(@mcnx1)
+      end
+
+      after do
+        @connections.delete(@mcnx1)
+        @connections.unshift(@cnx1)
+        [@cnx1, @cnx2].each { |c| @connection_pool.checkin(c) }
+      end
+
+      it %[should remove the disconnected client from the pool] do
+        @connection_pool.available_size.should == 2
+
+        @cnx2 = @connection_pool.checkout
+        
+        # this is gross and relies on knowing internal state
+        @connection_pool.checkout(false).should be_false
+
+        @cnx2.should_not be_nil
+        @cnx2.should_not == @mcnx1
+
+        @connection_pool.available_size.should == 0
+        @connections.should include(@mcnx1)
+      end
+    end
+
+  end # Simple
 
   describe :Bounded do
     before do
@@ -156,6 +201,7 @@ describe ZK::Pool do
       @max_clients = 2
       @connection_pool = ZK::Pool::Bounded.new("localhost:#{ZK_TEST_PORT}", :min_clients => @min_clients, :max_clients => @max_clients, :timeout => @timeout)
       @connection_pool.should be_open
+      wait_until(2) { @connection_pool.available_size > 0 }
     end
 
     after do
@@ -180,44 +226,25 @@ describe ZK::Pool do
 #       end
 
       it %[should grow if it can] do
-        q1 = Queue.new
+        wait_until(2) { @connection_pool.available_size > 0 }
+        @connection_pool.available_size.should > 0
 
         @connection_pool.size.should == 1
 
-        th1 = Thread.new do
-          @connection_pool.with_connection do |cnx|
-            Thread.current[:cnx] = cnx
-            q1.pop  # block here
-          end
-        end
+        logger.debug { "checking out @cnx1" }
+        @cnx1 = @connection_pool.checkout
+        @cnx1.should_not be_false
 
-        th1.join_until(2) { th1[:cnx] }
-        th1[:cnx].should_not be_nil
+        @connection_pool.can_grow_pool?.should be_true
 
-        th2 = Thread.new do
-          @connection_pool.with_connection do |cnx|
-            Thread.current[:cnx] = cnx
-            q1.pop
-          end
-        end
-
-        th2.join_until(2) { th2[:cnx] }
+        logger.debug { "checking out @cnx2" }
+        @cnx2 = @connection_pool.checkout
+        @cnx2.should_not be_false
+        @cnx2.should be_connected
 
-        th2[:cnx].should_not be_nil
-        th2[:cnx].should be_connected
+        @cnx1.object_id.should_not == @cnx2.object_id
 
-        @connection_pool.size.should == 2
-        @connection_pool.available_size.should be_zero
-
-        2.times { q1.enq(:release_cnx) }
-
-        lambda do
-          th1.join(1).should == th1
-          th2.join(1).should == th2
-        end.should_not raise_error
-
-        @connection_pool.size.should == 2
-        @connection_pool.available_size.should == 2
+        [@cnx1, @cnx2].each { |c| @connection_pool.checkin(c) }
       end
 
       it %[should not grow past max_clients and block] do
@@ -226,104 +253,49 @@ describe ZK::Pool do
 
         threads = []
 
-        2.times do
-          threads << Thread.new do
-            @connection_pool.with_connection do |cnx|
-              Thread.current[:cnx] = cnx
-              win_q.pop
-            end
-          end
-        end
+        @cnx1 = @connection_pool.checkout
+        @cnx1.should_not be_false
+
+        @connection_pool.can_grow_pool?.should be_true
+
+        @cnx2 = @connection_pool.checkout
+        @cnx2.should_not be_false
 
-        wait_until(2) { threads.all? { |th| th[:cnx] } }
-        threads.each { |th| th[:cnx].should_not be_nil }
+        @connection_pool.can_grow_pool?.should be_false
+
+        logger.debug { "spawning losing thread" }
 
         loser = Thread.new do
           @connection_pool.with_connection do |cnx|
             Thread.current[:cnx] = cnx
+            logger.debug { "Losing thread got connection" }
             lose_q.pop
           end
+          logger.debug { "losing thread exiting" }
         end
 
-        wait_until(2) { @connection_pool.count_waiters > 0 }
-        @connection_pool.count_waiters.should == 1
+        # loser.join_until(5) { @connection_pool.count_waiters > 0 }
+        # logger.debug { "count waiters: #{@connection_pool.count_waiters}" }
+        # @connection_pool.count_waiters.should == 1
 
         loser[:cnx].should be_nil
 
-        2.times { win_q.enq(:release) }
-
-        lambda { threads.each { |th| th.join(2).should == th } }.should_not raise_error
+        [@cnx1, @cnx2].each { |c| @connection_pool.checkin(c) }
 
         loser.join_until(2) { loser[:cnx] }
-
         loser[:cnx].should_not be_nil
 
         lose_q.enq(:release)
 
         lambda { loser.join(2).should == loser }.should_not raise_error
 
+        logger.debug { "joined losing thread" }
+
         @connection_pool.count_waiters.should be_zero
         @connection_pool.available_size.should == 2
         @connection_pool.size.should == 2
       end
-    end
-
-    describe 'health checking' do
-      before do
-        @connections = @connection_pool.connections
-        @connections.length.should == 1
-
-        @cnx1 = @connections.first
-      end
-
-      describe 'disconnected client' do
-        before do
-          flexmock(@cnx1) do |m|
-            m.should_receive(:connected?).and_return(false)
-          end
-
-          @cnx2 = nil
-
-          th = Thread.new do
-            @connection_pool.with_connection do |cnx|
-              @cnx2 = cnx
-            end
-          end
+    end   # should grow to max_clients
 
-          th.join_while { @cnx2.nil? }
-        end
-
-        it %[should create a new client and return it] do
-          @cnx2.should_not be_nil
-          @cnx2.should_not == @cnx1
-        end
-
-        it %[should remove the disconnected client from the pool] do
-          @connection_pool.available_size.should == 1
-        end
-
-        it %[should still have the original client in its array of all connections] do
-          @connections.should include(@cnx1)
-        end
-
-        describe 'when connected event fires' do
-          before do
-            @event = flexmock(:event) do |m|
-              m.should_receive(:type).and_return(-1)
-              m.should_receive(:zk=).with(any())
-              m.should_receive(:node_event?).and_return(false)
-              m.should_receive(:state_event?).and_return(true)
-              m.should_receive(:state).and_return(ZookeeperConstants::ZOO_CONNECTED_STATE)
-            end
-
-            @cnx1.watcher.process(@event)
-          end
-
-          it %[should add the connection back into the pool] do
-            @connection_pool.available_size.should == 2
-          end
-        end
-      end
-    end
   end
 end

data/spec/{threadpool_spec.rb → z_k/threadpool_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'spec_helper'
 
 describe ZK::Threadpool do
 
@@ -55,13 +55,16 @@ describe ZK::Threadpool do
   describe :start! do
     it %[should be able to start a threadpool that had previously been shutdown (reuse)] do
       @threadpool.shutdown
-      @threadpool.start!
+      @threadpool.start!.should be_true
 
       @threadpool.should be_running
 
       @rval = nil
 
-      @threadpool.defer { @rval = true }
+      @threadpool.defer do 
+        @rval = true
+      end
+
       wait_until(2) { @rval }
       @rval.should be_true
     end

data/zk.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.4.0'
   s.add_development_dependency 'wirble'
   s.add_development_dependency 'flexmock', '~> 0.8.10'
+  s.add_development_dependency 'ZenTest', '~> 4.5.0'
 
   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: 13
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +00:00
+date: 2011-06-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,22 @@ dependencies:
         version: 0.8.10
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 5
+        - 0
+        version: 4.5.0
+  type: :development
+  version_requirements: *id005
 description: A high-level wrapper around the zookeeper driver
 email: 
 - simms@hp.com
@@ -92,12 +108,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .dotfiles/rspec-logging
 - .gitignore
+- .yardopts
 - Gemfile
 - LICENSE
+- README.markdown
 - Rakefile
 - lib/z_k.rb
 - lib/z_k/client.rb
+- lib/z_k/client/base.rb
+- lib/z_k/client/conveniences.rb
+- lib/z_k/client/state_mixin.rb
+- lib/z_k/client/unixisms.rb
 - lib/z_k/election.rb
 - lib/z_k/event_handler.rb
 - lib/z_k/event_handler_subscription.rb
@@ -112,19 +135,20 @@ files:
 - lib/z_k/threadpool.rb
 - lib/z_k/version.rb
 - lib/zk.rb
-- spec/client_pool_spec.rb
-- spec/client_spec.rb
-- spec/election_spec.rb
-- spec/locker_spec.rb
 - spec/log4j.properties
 - spec/message_queue_spec.rb
-- spec/mongoid_spec.rb
 - spec/spec_helper.rb
 - spec/support/bogus_mongoid.rb
+- spec/support/logging_progress_bar_formatter.rb
 - spec/support/queuey_thread.rb
 - spec/test_file.txt
-- spec/threadpool_spec.rb
 - spec/watch_spec.rb
+- spec/z_k/client_spec.rb
+- spec/z_k/election_spec.rb
+- spec/z_k/locker_spec.rb
+- spec/z_k/mongoid_spec.rb
+- spec/z_k/pool_spec.rb
+- spec/z_k/threadpool_spec.rb
 - spec/zookeeper_spec.rb
 - zk.gemspec
 has_rdoc: true
@@ -161,18 +185,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A high-level wrapper around the zookeeper driver
-test_files: 
-- spec/client_pool_spec.rb
-- spec/client_spec.rb
-- spec/election_spec.rb
-- spec/locker_spec.rb
-- spec/log4j.properties
-- spec/message_queue_spec.rb
-- spec/mongoid_spec.rb
-- spec/spec_helper.rb
-- spec/support/bogus_mongoid.rb
-- spec/support/queuey_thread.rb
-- spec/test_file.txt
-- spec/threadpool_spec.rb
-- spec/watch_spec.rb
-- spec/zookeeper_spec.rb
+test_files: []
+