mongo 2.5.0.beta → 2.5.0

data/spec/mongo/server/connection_pool/queue_spec.rb

@@ -35,6 +35,7 @@ describe Mongo::Server::ConnectionPool::Queue do
     context 'when waiting for a connection to be enqueued' do
 
       before do
+        allow(connection).to receive(:record_checkin!).and_return(connection)
         Thread.new do
           sleep(0.5)
           queue.enqueue(connection)
@@ -66,7 +67,9 @@ describe Mongo::Server::ConnectionPool::Queue do
   describe '#enqueue' do
 
     let(:connection) do
-      double('connection')
+      double('connection').tap do |con|
+        allow(con).to receive(:record_checkin!).and_return(con)
+      end
     end
 
     let(:queue) do
@@ -105,7 +108,7 @@ describe Mongo::Server::ConnectionPool::Queue do
         described_class.new { double('connection') }
       end
 
-      it 'creates the queue with the default connections' do
+      it 'creates the queue with the number of default connections' do
         expect(queue.size).to eq(1)
       end
     end
@@ -187,4 +190,34 @@ describe Mongo::Server::ConnectionPool::Queue do
       end
     end
   end
+
+  describe 'close_stale_sockets!!' do
+
+    let(:queue) do
+      described_class.new(max_pool_size: 2, max_idle_time: 0.5) do
+        double('connection').tap do |con|
+          expect(con).to receive(:disconnect!).and_return(true)
+          allow(con).to receive(:record_checkin!) do
+            allow(con).to receive(:last_checkin).and_return(Time.now)
+            con
+          end
+        end
+      end
+    end
+
+    let(:connection) do
+      queue.dequeue
+    end
+
+    before do
+      queue.enqueue(connection)
+      expect(connection).to receive(:connect!).and_return(true)
+      sleep(0.5)
+      queue.close_stale_sockets!
+    end
+
+    it 'disconnects and reconnects up to min_size the expired connections' do
+      expect(queue.size).to eq(1)
+    end
+  end
 end

data/spec/mongo/server/connection_pool_spec.rb

@@ -110,6 +110,17 @@ describe Mongo::Server::ConnectionPool do
         expect(pool.checkout).to_not eql(connection)
       end
     end
+
+    context 'when connections are checked out and checked back in' do
+
+      it 'pulls the connection from the front of the queue' do
+        first = pool.checkout
+        second = pool.checkout
+        pool.checkin(second)
+        pool.checkin(first)
+        expect(pool.checkout).to be(first)
+      end
+    end
   end
 
   describe '#disconnect!' do
@@ -217,7 +228,7 @@ describe Mongo::Server::ConnectionPool do
     before do
      t = Thread.new {
         # Kill the thread when it's authenticating
-        allow(Mongo::Auth).to receive(:get) { t.kill }
+        allow(Mongo::Auth).to receive(:get) { t.kill and t.stop? }
         pool.with_connection { |c| c.send(:ensure_connected) { |socket| socket } }
       }
       t.join
@@ -227,4 +238,226 @@ describe Mongo::Server::ConnectionPool do
       expect(pool.checkout.send(:socket)).to be_nil
     end
   end
+
+  describe '#close_stale_sockets!' do
+
+    let(:server) do
+      Mongo::Server.new(address, authorized_client.cluster, monitoring, listeners, options)
+    end
+
+    let!(:pool) do
+      described_class.get(server)
+    end
+
+    let(:queue) do
+      pool.instance_variable_get(:@queue).queue
+    end
+
+    context 'when there is a max_idle_time specified' do
+
+      let(:options) do
+        TEST_OPTIONS.merge(max_pool_size: 2, max_idle_time: 0.5)
+      end
+
+      context 'when the connections have not been checked out' do
+
+        before do
+          queue.each do |conn|
+            expect(conn).not_to receive(:disconnect!)
+          end
+          sleep(0.5)
+          pool.close_stale_sockets!
+        end
+
+        it 'does not close any sockets' do
+          expect(queue.none? { |c| c.connected? }).to be(true)
+        end
+      end
+
+      context 'when the sockets have already been checked out and returned to the pool' do
+
+        context 'when min size is 0' do
+
+          let(:options) do
+            TEST_OPTIONS.merge(max_pool_size: 2, min_pool_size: 0, max_idle_time: 0.5)
+          end
+
+          before do
+            queue.each do |conn|
+              expect(conn).to receive(:disconnect!).and_call_original
+            end
+            pool.checkin(pool.checkout)
+            pool.checkin(pool.checkout)
+            sleep(0.5)
+            pool.close_stale_sockets!
+          end
+
+          it 'closes all stale sockets' do
+            expect(queue.all? { |c| !c.connected? }).to be(true)
+          end
+        end
+
+        context 'when min size is > 0' do
+
+          context 'when more than the number of min_size are checked out' do
+
+            let(:options) do
+              TEST_OPTIONS.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
+            end
+
+            before do
+              first = pool.checkout
+              second = pool.checkout
+              third = pool.checkout
+              fourth = pool.checkout
+              fifth = pool.checkout
+
+              pool.checkin(fifth)
+
+              expect(fifth).to receive(:disconnect!).and_call_original
+              expect(fifth).not_to receive(:connect!)
+
+              sleep(0.5)
+              pool.close_stale_sockets!
+            end
+
+            it 'closes all stale sockets and does not connect new ones' do
+              expect(queue.size).to be(1)
+              expect(queue[0].connected?).to be(false)
+            end
+          end
+
+          context 'when between 0 and min_size number of connections are checked out' do
+
+            let(:options) do
+              TEST_OPTIONS.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
+            end
+
+            before do
+              first = pool.checkout
+              second = pool.checkout
+              third = pool.checkout
+              fourth = pool.checkout
+              fifth = pool.checkout
+
+              pool.checkin(third)
+              pool.checkin(fourth)
+              pool.checkin(fifth)
+
+
+              expect(third).to receive(:disconnect!).and_call_original
+              expect(third).not_to receive(:connect!)
+
+              expect(fourth).to receive(:disconnect!).and_call_original
+              expect(fourth).not_to receive(:connect!)
+
+              expect(fifth).to receive(:disconnect!).and_call_original
+              expect(fifth).to receive(:connect!).and_call_original
+
+              sleep(0.5)
+              pool.close_stale_sockets!
+            end
+
+            it 'closes all stale sockets and does not connect new ones' do
+              expect(queue.size).to be(3)
+              expect(queue[0].connected?).to be(true)
+              expect(queue[1].connected?).to be(false)
+              expect(queue[2].connected?).to be(false)
+            end
+          end
+
+          context 'when a stale connection is unsuccessfully reconnected' do
+
+            let(:options) do
+              TEST_OPTIONS.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
+            end
+
+            before do
+              first = pool.checkout
+              second = pool.checkout
+              third = pool.checkout
+              fourth = pool.checkout
+              fifth = pool.checkout
+
+              pool.checkin(third)
+              pool.checkin(fourth)
+              pool.checkin(fifth)
+
+
+              expect(third).to receive(:disconnect!).and_call_original
+              expect(third).not_to receive(:connect!)
+
+              expect(fourth).to receive(:disconnect!).and_call_original
+              expect(fourth).not_to receive(:connect!)
+
+              expect(fifth).to receive(:disconnect!).and_call_original
+              allow(fifth).to receive(:connect!).and_raise(Mongo::Error::SocketError)
+
+              sleep(0.5)
+              pool.close_stale_sockets!
+            end
+
+            it 'is kept in the pool' do
+              expect(queue.size).to be(3)
+              expect(queue[0].connected?).to be(false)
+              expect(queue[1].connected?).to be(false)
+              expect(queue[2].connected?).to be(false)
+            end
+          end
+
+          context 'when exactly the min_size number of connections is checked out' do
+
+            let(:options) do
+              TEST_OPTIONS.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
+            end
+
+            before do
+              first = pool.checkout
+              second = pool.checkout
+              third = pool.checkout
+              fourth = pool.checkout
+              fifth = pool.checkout
+
+              pool.checkin(fourth)
+              pool.checkin(fifth)
+
+              expect(fourth).to receive(:disconnect!).and_call_original
+              expect(fourth).not_to receive(:connect!)
+
+              expect(fifth).to receive(:disconnect!).and_call_original
+              expect(fifth).not_to receive(:connect!)
+
+              sleep(0.5)
+              pool.close_stale_sockets!
+            end
+
+            it 'closes all stale sockets and does not connect new ones' do
+              expect(queue.size).to be(2)
+              expect(queue[0].connected?).to be(false)
+              expect(queue[1].connected?).to be(false)
+            end
+          end
+        end
+      end
+    end
+
+    context 'when there is no max_idle_time specified' do
+
+      let(:connection) do
+        conn = pool.checkout
+        conn.connect!
+        pool.checkin(conn)
+        conn
+      end
+
+      before do
+        expect(connection).not_to receive(:disconnect!)
+        pool.close_stale_sockets!
+      end
+
+      it 'does not close any sockets' do
+        expect(connection.connected?).to be(true)
+      end
+    end
+  end
 end

data/spec/mongo/server/connection_spec.rb

@@ -336,7 +336,7 @@ describe Mongo::Server::Connection do
       it 'closes the socket and does not use it for subsequent requests' do
         t = Thread.new {
           # Kill the thread just before the reply is read
-          allow(Mongo::Protocol::Message).to receive(:deserialize_header) { t.kill }
+          allow(Mongo::Protocol::Reply).to receive(:deserialize_header) { t.kill and t.stop? }
           connection.dispatch([ query_bob ])
         }
         t.join
@@ -439,13 +439,17 @@ describe Mongo::Server::Connection do
 
       it 'raises a timeout when it expires' do
         start = Time.now
-        expect {
-          Timeout::timeout(3) do
+        begin
+          Timeout::timeout(1.5 + 2) do
             client[authorized_collection.name].find("$where" => "sleep(2000) || true").first
           end
-        }.to raise_exception(Timeout::Error, "Took more than 1.5 seconds to receive data.")
-        end_time = Time.now
-        expect(end_time - start).to be_within(0.2).of(1.5)
+        rescue => ex
+          end_time = Time.now
+          expect(ex).to be_a(Timeout::Error)
+          expect(ex.message).to eq("Took more than 1.5 seconds to receive data.")
+        end
+        # Account for wait queue timeout (2s) and rescue
+        expect(end_time - start).to be_within(2.5).of(1.5)
       end
 
       context 'when the socket_timeout is negative' do

data/spec/mongo/server/description/features_spec.rb

@@ -2,12 +2,16 @@ require 'spec_helper'
 
 describe Mongo::Server::Description::Features do
 
+  let(:features) do
+    described_class.new(wire_versions, default_address)
+  end
+
   describe '#initialize' do
 
     context 'when the server wire version range is the same' do
 
-      let(:features) do
-        described_class.new(0..3)
+      let(:wire_versions) do
+        0..3
       end
 
       it 'sets the server wire version range' do
@@ -17,17 +21,21 @@ describe Mongo::Server::Description::Features do
 
     context 'when the server wire version range min is higher' do
 
+      let(:wire_versions) do
+        described_class::DRIVER_WIRE_VERSIONS.max+1..described_class::DRIVER_WIRE_VERSIONS.max+2
+      end
+
       it 'raises an exception' do
         expect {
-          described_class.new(described_class::DRIVER_WIRE_VERSIONS.max+1..described_class::DRIVER_WIRE_VERSIONS.max+2)
+          features
         }.to raise_error(Mongo::Error::UnsupportedFeatures)
       end
     end
 
     context 'when the server wire version range max is higher' do
 
-      let(:features) do
-        described_class.new(0..4)
+      let(:wire_versions) do
+        0..4
       end
 
       it 'sets the server wire version range' do
@@ -37,17 +45,21 @@ describe Mongo::Server::Description::Features do
 
     context 'when the server wire version range max is lower' do
 
+      let(:wire_versions) do
+        described_class::DRIVER_WIRE_VERSIONS.min-2..described_class::DRIVER_WIRE_VERSIONS.min-1
+      end
+
       it 'raises an exception' do
         expect {
-          described_class.new(described_class::DRIVER_WIRE_VERSIONS.min-2..described_class::DRIVER_WIRE_VERSIONS.min-1)
+          features
         }.to raise_error(Mongo::Error::UnsupportedFeatures)
       end
     end
 
     context 'when the server wire version range max is lower' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'sets the server wire version range' do
@@ -60,8 +72,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 5' do
 
-      let(:features) do
-        described_class.new(0..5)
+      let(:wire_versions) do
+        0..5
       end
 
       it 'returns true' do
@@ -71,8 +83,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 5' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do
@@ -85,8 +97,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 5' do
 
-      let(:features) do
-        described_class.new(0..5)
+      let(:wire_versions) do
+        0..5
       end
 
       it 'returns true' do
@@ -96,8 +108,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 5' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do
@@ -110,8 +122,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 4' do
 
-      let(:features) do
-        described_class.new(0..4)
+      let(:wire_versions) do
+        0..4
       end
 
       it 'returns true' do
@@ -121,8 +133,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 4' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do
@@ -135,8 +147,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 3' do
 
-      let(:features) do
-        described_class.new(0..3)
+      let(:wire_versions) do
+        0..3
       end
 
       it 'returns true' do
@@ -146,8 +158,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 3' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do
@@ -160,8 +172,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 3' do
 
-      let(:features) do
-        described_class.new(0..3)
+      let(:wire_versions) do
+        0..3
       end
 
       it 'returns true' do
@@ -171,8 +183,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 3' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do
@@ -185,8 +197,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 2' do
 
-      let(:features) do
-        described_class.new(0..3)
+      let(:wire_versions) do
+        0..3
       end
 
       it 'returns true' do
@@ -196,12 +208,14 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 2' do
 
-      let(:features) do
-        described_class.new(0..1)
+      let(:wire_versions) do
+        0..1
       end
 
       it 'returns false' do
-        expect(features).to_not be_write_command_enabled
+        expect {
+          features
+        }.to raise_exception(Mongo::Error::UnsupportedFeatures)
       end
     end
   end
@@ -210,8 +224,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range includes 3' do
 
-      let(:features) do
-        described_class.new(0..3)
+      let(:wire_versions) do
+        0..3
       end
 
       it 'returns true' do
@@ -221,8 +235,8 @@ describe Mongo::Server::Description::Features do
 
     context 'when the wire range does not include 3' do
 
-      let(:features) do
-        described_class.new(0..2)
+      let(:wire_versions) do
+        0..2
       end
 
       it 'returns false' do