mongo 2.7.2 → 2.8.0.rc0

data/spec/mongo/client_construction_spec.rb

@@ -203,7 +203,7 @@ describe Mongo::Client do
           it 'does not use compression for authentication messages' do
             expect(Mongo::Protocol::Compressed).not_to receive(:new)
             client.cluster.next_primary.send(:with_connection) do |conn|
-              conn.send(:authenticate!)
+              conn.send(:authenticate!, conn)
             end
           end
         end

data/spec/mongo/error/operation_failure_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Error::OperationFailure do
 
@@ -219,4 +219,128 @@ describe Mongo::Error::OperationFailure do
       end
     end
   end
+
+  describe '#not_master?' do
+    [10107, 13435].each do |code|
+      context "error code #{code}" do
+        subject do
+          described_class.new("thingy (#{code})", nil,
+            :code => code, :code_name => 'thingy')
+        end
+
+        it 'is true' do
+          expect(subject.not_master?).to be true
+        end
+      end
+    end
+
+    # node is recovering error codes
+    [11600, 11602, 13436, 189, 91].each do |code|
+      context "error code #{code}" do
+        subject do
+          described_class.new("thingy (#{code})", nil,
+            :code => code, :code_name => 'thingy')
+        end
+
+        it 'is false' do
+          expect(subject.not_master?).to be false
+        end
+      end
+    end
+
+    context 'another error code' do
+      subject do
+        described_class.new('some error (123)', nil,
+          :code => 123, :code_name => 'SomeError')
+      end
+
+      it 'is false' do
+        expect(subject.not_master?).to be false
+      end
+    end
+
+    context 'not master in message with different code' do
+      subject do
+        described_class.new('not master (999)', nil,
+          :code => 999, :code_name => nil)
+      end
+
+      it 'is true' do
+        expect(subject.not_master?).to be true
+      end
+    end
+
+    context 'not master or secondary text' do
+      subject do
+        described_class.new('not master or secondary (999)', nil,
+          :code => 999, :code_name => nil)
+      end
+
+      it 'is false' do
+        expect(subject.not_master?).to be false
+      end
+    end
+  end
+
+  describe '#node_recovering?' do
+    [11600, 11602, 13436, 189, 91].each do |code|
+      context "error code #{code}" do
+        subject do
+          described_class.new("thingy (#{code})", nil,
+            :code => code, :code_name => 'thingy')
+        end
+
+        it 'is true' do
+          expect(subject.node_recovering?).to be true
+        end
+      end
+    end
+
+    # not master error codes
+    [10107, 13435].each do |code|
+      context "error code #{code}" do
+        subject do
+          described_class.new("thingy (#{code})", nil,
+            :code => code, :code_name => 'thingy')
+        end
+
+        it 'is false' do
+          expect(subject.node_recovering?).to be false
+        end
+      end
+    end
+
+    context 'another error code' do
+      subject do
+        described_class.new('some error (123)', nil,
+          :code => 123, :code_name => 'SomeError')
+      end
+
+      it 'is false' do
+        expect(subject.node_recovering?).to be false
+      end
+    end
+
+    context 'node is recovering in message with different code' do
+      subject do
+        described_class.new('node is recovering (999)', nil,
+          :code => 999, :code_name => nil)
+      end
+
+      it 'is true' do
+        expect(subject.node_recovering?).to be true
+      end
+    end
+
+    context 'not master or secondary text' do
+      subject do
+        described_class.new('not master or secondary (999)', nil,
+          :code => 999, :code_name => nil)
+      end
+
+      it 'is true' do
+        expect(subject.node_recovering?).to be true
+      end
+    end
+  end
 end

data/spec/mongo/retryable_spec.rb

@@ -79,12 +79,14 @@ describe Mongo::Retryable do
     double('operation')
   end
 
+  let(:server) { double('server') }
+
   let(:cluster) do
-    double('cluster', next_primary: server_selector)
+    double('cluster', next_primary: server)
   end
 
   let(:server_selector) do
-    double('server_selector', select_server: double('server'))
+    double('server_selector', select_server: server)
   end
 
   let(:retryable) do
@@ -418,7 +420,7 @@ describe Mongo::Retryable do
       # Quick sanity check that the expected code path is being exercised
       expect(retryable.retry_write_allowed_as_configured?).to be true
 
-      allow(server_selector).to receive(:retry_writes?).and_return(true)
+      allow(server).to receive(:retry_writes?).and_return(true)
       allow(cluster).to receive(:scan!)
     end
 
@@ -442,9 +444,9 @@ describe Mongo::Retryable do
     context 'when a not master error occurs' do
 
       before do
+        server = cluster.next_primary
         expect(operation).to receive(:execute).and_raise(
           Mongo::Error::OperationFailure.new('not master')).ordered
-        expect(cluster).to receive(:scan!).and_return(true).ordered
         expect(operation).to receive(:execute).and_return(true).ordered
       end
 
@@ -454,9 +456,9 @@ describe Mongo::Retryable do
     context 'when a node is recovering error occurs' do
 
       before do
+        server = cluster.next_primary
         expect(operation).to receive(:execute).and_raise(
           Mongo::Error::OperationFailure.new('node is recovering')).ordered
-        expect(cluster).to receive(:scan!).and_return(true).ordered
         expect(operation).to receive(:execute).and_return(true).ordered
       end
 
@@ -466,10 +468,10 @@ describe Mongo::Retryable do
     context 'when a retryable error occurs with a code' do
 
       before do
+        server = cluster.next_primary
         expect(operation).to receive(:execute).and_raise(
           Mongo::Error::OperationFailure.new('message missing', nil,
             :code => 91, :code_name => 'ShutdownInProgress')).ordered
-        expect(cluster).to receive(:scan!).and_return(true).ordered
         expect(operation).to receive(:execute).and_return(true).ordered
       end
 
@@ -494,7 +496,10 @@ describe Mongo::Retryable do
       before do
         expect(operation).to receive(:execute).and_raise(
           Mongo::Error::SocketError.new('socket error')).ordered
-        expect(cluster).to receive(:scan!).and_return(true).ordered
+        # This is where the server would be marked unknown, but since
+        # we are not tracking which server the operation was sent to,
+        # we are not able to assert this.
+        # There is no explicit cluster scan requested.
         expect(operation).to receive(:execute).and_return(true).ordered
       end
 
@@ -506,7 +511,11 @@ describe Mongo::Retryable do
       before do
         expect(operation).to receive(:execute).and_raise(
           Mongo::Error::SocketTimeoutError.new('socket timeout')).ordered
-        expect(cluster).to receive(:scan!).and_return(true).ordered
+        # This is where the server would be marked unknown, but since
+        # we are not tracking which server the operation was sent to,
+        # we are not able to assert this.
+        # There is no explicit cluster scan requested (and the operation may
+        # end up being sent to the same server it was sent to originally).
         expect(operation).to receive(:execute).and_return(true).ordered
       end
 

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

@@ -96,14 +96,14 @@ describe Mongo::Server::ConnectionPool::Queue do
         create_queue(1)
       end
 
-      it 'disconnects all connections in the queue and recreates up to min size with new generation' do
+      it 'disconnects all connections in the queue and bumps generation' do
         expect(queue.queue_size).to eq(2)
         expect(queue.pool_size).to eq(2)
 
         queue.disconnect!
 
-        expect(queue.queue_size).to eq(1)
-        expect(queue.pool_size).to eq(1)
+        expect(queue.queue_size).to eq(0)
+        expect(queue.pool_size).to eq(0)
 
         new_connection = queue.dequeue
         expect(new_connection).not_to eq(connection)
@@ -304,12 +304,14 @@ describe Mongo::Server::ConnectionPool::Queue do
   end
 
   describe 'close_stale_sockets!!' do
+    after do
+      Timecop.return
+    end
 
     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(:generation).and_return(1)
-          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
@@ -324,16 +326,28 @@ describe Mongo::Server::ConnectionPool::Queue do
       end
     end
 
-    before do
-      queue.enqueue(connection)
-      expect(connection).to receive(:connect!).and_return(true)
-      sleep(0.5)
+    it 'disconnects all expired and only expired connections' do
+      c1 = queue.dequeue
+      expect(c1).to receive(:disconnect!)
+      c2 = queue.dequeue
+      expect(c2).not_to receive(:disconnect!)
+
+      queue.enqueue(c1)
+      Timecop.travel(Time.now + 1)
+      queue.enqueue(c2)
+
+      expect(queue.queue_size).to eq(2)
+      expect(queue.pool_size).to eq(2)
+      expect(queue.queue.length).to eq(2)
+
+      expect(c1).not_to receive(:connect!)
+      expect(c2).not_to receive(:connect!)
+
       queue.close_stale_sockets!
-    end
 
-    it 'disconnects and reconnects up to min_size the expired connections' do
       expect(queue.queue_size).to eq(1)
       expect(queue.pool_size).to eq(1)
+      expect(queue.queue.length).to eq(1)
     end
   end
 end

data/spec/mongo/server/connection_pool_spec.rb

@@ -35,11 +35,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 
@@ -70,7 +70,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     context 'when no connection is checked out on the same thread' do
@@ -129,36 +129,16 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     it 'disconnects the queue' do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       expect(pool.send(:queue)).to receive(:disconnect!).once.and_call_original
       server.disconnect!
     end
   end
 
-  describe '.get' do
-
-    let(:server) do
-      Mongo::Server.new(address, cluster, monitoring, listeners, options)
-    end
-
-    let!(:pool) do
-      described_class.get(server)
-    end
-
-    after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
-      server.disconnect!
-    end
-
-    it 'returns the pool for the server' do
-      expect(pool).to_not be_nil
-    end
-  end
-
   describe '#inspect' do
 
     let(:server) do
@@ -166,11 +146,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 
@@ -190,7 +170,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     context 'when a connection cannot be checked out' do
@@ -217,7 +197,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     let(:options) do
@@ -245,7 +225,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     let!(:pool) do
-      described_class.get(server)
+      server.pool
     end
 
     let(:queue) do
@@ -297,14 +277,16 @@ describe Mongo::Server::ConnectionPool do
         end
 
         context 'when min size is > 0' do
+          after do
+            Timecop.return
+          end
 
           context 'when more than the number of min_size are checked out' do
-
             let(:options) do
               SpecConfig.instance.test_options.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
             end
 
-            before do
+            it 'closes and removes connections with stale sockets and does not connect new ones' do
               first = pool.checkout
               second = pool.checkout
               third = pool.checkout
@@ -316,13 +298,14 @@ describe Mongo::Server::ConnectionPool do
               expect(fifth).to receive(:disconnect!).and_call_original
               expect(fifth).not_to receive(:connect!)
 
-              sleep(0.5)
+              Timecop.travel(Time.now + 1)
+              expect(queue.length).to be(1)
               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)
+              expect(pool.send(:queue).pool_size).to be(4)
+              expect(pool.send(:queue).queue_size).to be(0)
+              expect(queue.length).to be(0)
+              expect(fifth.connected?).to be(false)
             end
           end
 
@@ -332,46 +315,7 @@ describe Mongo::Server::ConnectionPool do
               SpecConfig.instance.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
-              SpecConfig.instance.test_options.merge(max_pool_size: 5, min_pool_size: 3, max_idle_time: 0.5)
-            end
-
-            before do
+            it 'closes and removes connections with stale sockets and does not connect new ones' do
               first = pool.checkout
               second = pool.checkout
               third = pool.checkout
@@ -390,50 +334,19 @@ describe Mongo::Server::ConnectionPool do
               expect(fourth).not_to receive(:connect!)
 
               expect(fifth).to receive(:disconnect!).and_call_original
-              allow(fifth).to receive(:connect!).and_raise(Mongo::Error::SocketError)
+              expect(fifth).not_to receive(:connect!).and_call_original
 
-              sleep(0.5)
+              Timecop.travel(Time.now + 1)
+              expect(queue.length).to be(3)
               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
-              SpecConfig.instance.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
+              expect(pool.send(:queue).pool_size).to be(2)
+              expect(pool.send(:queue).queue_size).to be(0)
+              expect(queue.length).to be(0)
 
-            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)
+              expect(third.connected?).to be(false)
+              expect(fourth.connected?).to be(false)
+              expect(fifth.connected?).to be(false)
             end
           end
         end