mongo 2.12.4 → 2.14.0.rc1

data/spec/mongo/server/monitor/app_metadata_spec.rb

@@ -1,16 +1,23 @@
 require 'lite_spec_helper'
+require_relative '../app_metadata_shared'
 
 describe Mongo::Server::Monitor::AppMetadata do
 
   describe '#document' do
+    let(:document) do
+      app_metadata.send(:document)
+    end
+
     context 'when user is given and auth_mech is not given' do
       let(:app_metadata) do
         described_class.new(user: 'foo')
       end
 
       it 'does not include saslSupportedMechs' do
-        expect(app_metadata.send(:document)).not_to have_key(:saslSupportedMechs)
+        expect(document).not_to have_key(:saslSupportedMechs)
       end
     end
+
+    it_behaves_like 'app metadata document'
   end
 end

data/spec/mongo/server/monitor/connection_spec.rb

@@ -33,7 +33,7 @@ describe Mongo::Server::Monitor::Connection do
           app_metadata: Mongo::Server::Monitor::AppMetadata.new(options),
         }.update(options))
     ).tap do |monitor|
-      monitor.run!
+      monitor.scan!
     end
   end
 
@@ -122,85 +122,4 @@ describe Mongo::Server::Monitor::Connection do
       end
     end
   end
-
-  describe '#ismaster' do
-    let(:options) do
-      SpecConfig.instance.test_options
-    end
-
-    let(:result) { connection.ismaster }
-
-    it 'returns a hash' do
-      expect(result).to be_a(Hash)
-    end
-
-    it 'is successful' do
-      expect(result['ok']).to eq(1.0)
-    end
-
-    context 'network error during ismaster' do
-      let(:result) do
-        connection
-
-        socket = connection.send(:socket).send(:socket)
-        expect([Socket, OpenSSL::SSL::SSLSocket]).to include(socket.class)
-
-        expect(socket).to receive(:write).and_raise(IOError)
-        expect(socket).to receive(:write).and_call_original
-
-        connection.ismaster
-      end
-
-      before do
-        # Since we set expectations on the connection, kill the
-        # background thread (but without disconnecting the connection).
-        # Note also that we need to have the connection connected in
-        # the first place, thus the scan! call here.
-        monitor.scan!
-        monitor.instance_variable_get('@thread').kill
-        monitor.instance_variable_get('@thread').join
-      end
-
-      it 'retries ismaster and is successful' do
-        expect(result).to be_a(Hash)
-        expect(result['ok']).to eq(1.0)
-      end
-
-      it 'logs the retry' do
-        expect(Mongo::Logger.logger).to receive(:warn) do |msg|
-          expect(msg).to match(/Retrying ismaster in monitor for #{connection.address}/)
-        end
-        expect(result).to be_a(Hash)
-      end
-    end
-  end
-
-  describe '#connect!' do
-    context 'network error' do
-      before do
-        address
-        monitor.instance_variable_get('@thread').kill
-        monitor.connection.disconnect!
-      end
-
-      let(:options) { SpecConfig.instance.test_options }
-
-      let(:expected_message) { "MONGODB | Failed to handshake with #{address}: Mongo::Error::SocketError: test error" }
-
-      it 'logs a warning' do
-        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
-
-        messages = []
-        expect(Mongo::Logger.logger).to receive(:warn) do |msg|
-          messages << msg
-        end
-
-        expect do
-          monitor.connection.connect!
-        end.to raise_error(Mongo::Error::SocketError, 'test error')
-
-        messages.any? { |msg| msg.include?(expected_message) }.should be true
-      end
-    end
-  end
 end

data/spec/mongo/server/monitor_spec.rb

@@ -54,14 +54,8 @@ describe Mongo::Server::Monitor do
         {monitoring_io: false}
       end
 
-      let(:socket) do
-        monitor.connection.connect!
-        monitor.connection.__send__(:socket)
-      end
-
-      it 'retries the ismaster' do
-        expect(socket).to receive(:write).once.and_raise(Mongo::Error::SocketError)
-        expect(socket).to receive(:write).and_call_original
+      it 'runs sdam flow on unknown description' do
+        expect(monitor).to receive(:ismaster).once.and_raise(Mongo::Error::SocketError)
         expect(cluster).to receive(:run_sdam_flow)
         monitor.scan!
       end
@@ -108,15 +102,10 @@ describe Mongo::Server::Monitor do
           default_address
         end
 
-        let(:socket) do
-          monitor.connection.connect!
-          monitor.connection.__send__(:socket)
-        end
-
         before do
-          expect(socket).to receive(:write).twice.and_raise(Mongo::Error::SocketError)
           server.unknown!
           expect(server.description).to be_unknown
+          expect(monitor).to receive(:ismaster).and_raise(Mongo::Error::SocketError)
           monitor.scan!
         end
 
@@ -125,7 +114,7 @@ describe Mongo::Server::Monitor do
         end
 
         it 'disconnects the connection' do
-          expect(monitor.connection).to_not be_connected
+          expect(monitor.connection).to be nil
         end
       end
     end
@@ -234,11 +223,12 @@ describe Mongo::Server::Monitor do
       end
 
       it 'sets the value as the timeout on the connection' do
-        expect(monitor.connection.timeout).to eq(connect_timeout)
+        monitor.scan!
+        expect(monitor.connection.socket_timeout).to eq(connect_timeout)
       end
 
       it 'set the value as the timeout on the socket' do
-        monitor.connection.connect!
+        monitor.scan!
         expect(monitor.connection.send(:socket).timeout).to eq(connect_timeout)
       end
     end
@@ -251,4 +241,73 @@ describe Mongo::Server::Monitor do
       end.not_to raise_error
     end
   end
+
+  describe '#do_scan' do
+
+    let(:result) { monitor.send(:do_scan) }
+
+    it 'returns a hash' do
+      expect(result).to be_a(Hash)
+    end
+
+    it 'is successful' do
+      expect(result['ok']).to eq(1.0)
+    end
+
+    context 'network error during ismaster' do
+      let(:result) do
+        expect(monitor).to receive(:ismaster).and_raise(IOError)
+        # The retry is done on a new socket instance.
+        #expect(socket).to receive(:write).and_call_original
+
+        monitor.send(:do_scan)
+      end
+
+      it 'adds server diagnostics' do
+        expect(Mongo::Logger.logger).to receive(:warn) do |msg|
+          # The "on <address>" and "for <address>" bits are in different parts
+          # of the message.
+          expect(msg).to match(/on #{server.address}/)
+        end
+        expect(result).to be_a(Hash)
+      end
+    end
+
+    context 'network error during connection' do
+      let(:options) { SpecConfig.instance.test_options }
+
+      let(:expected_message) { "MONGODB | Failed to handshake with #{address}: Mongo::Error::SocketError: test error" }
+
+      before do
+        monitor.connection.should be nil
+      end
+
+      it 'logs a warning' do
+        # Note: the mock call below could mock do_write and raise IOError.
+        # It is correct in raising Error::SocketError if mocking write
+        # which performs exception mapping.
+        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
+
+        messages = []
+        expect(Mongo::Logger.logger).to receive(:warn).at_least(:once) do |msg|
+          messages << msg
+        end
+
+        monitor.scan!.should be_unknown
+
+        messages.any? { |msg| msg.include?(expected_message) }.should be true
+      end
+
+      it 'adds server diagnostics' do
+        # Note: the mock call below could mock do_write and raise IOError.
+        # It is correct in raising Error::SocketError if mocking write
+        # which performs exception mapping.
+        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
+
+        expect do
+          monitor.send(:ismaster)
+        end.to raise_error(Mongo::Error::SocketError, /on #{server.address}/)
+      end
+    end
+  end
 end

data/spec/mongo/server/round_trip_time_averager_spec.rb

@@ -34,9 +34,11 @@ describe Mongo::Server::RoundTripTimeAverager do
     context 'block raises' do
       it 'does not update average rtt' do
         expect(averager).not_to receive(:update_average_round_trip_time)
-        averager.measure do
-          raise "Problem"
-        end
+        lambda do
+          averager.measure do
+            raise "Problem"
+          end
+        end.should raise_error(/Problem/)
       end
     end
   end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::Nearest do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
   it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#initialize' do
@@ -113,13 +114,13 @@ describe Mongo::ServerSelector::Nearest do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -127,7 +128,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -135,7 +136,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -143,7 +144,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [primary, secondary] }
 
       it 'returns an array with the primary and secondary' do
-        expect(selector.send(:select, candidates)).to match_array([primary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to match_array([primary, secondary])
       end
     end
 
@@ -151,7 +152,7 @@ describe Mongo::ServerSelector::Nearest do
       let(:candidates) { [secondary, secondary] }
 
       it 'returns an array with the secondaries' do
-        expect(selector.send(:select, candidates)).to match_array([secondary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to match_array([secondary, secondary])
       end
     end
 
@@ -170,7 +171,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -178,7 +179,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -186,7 +187,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -194,7 +195,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
       end
@@ -205,7 +206,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -213,7 +214,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array with the matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -221,7 +222,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, matching_secondary, secondary] }
 
           it 'returns an array with the matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -230,7 +231,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with the matching secondaries' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -239,7 +240,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [matching_primary, matching_secondary] }
 
           it 'returns an array with the matching primary and secondary' do
-            expect(selector.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
           end
         end
       end
@@ -255,7 +256,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -263,7 +264,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -274,7 +275,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, secondary] }
 
           it 'returns array with primary and secondary' do
-            expect(selector.send(:select, candidates)).to match_array(
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(
               [primary, secondary]
             )
           end
@@ -284,7 +285,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns array with local primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -292,7 +293,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:candidates) { [far_primary, secondary] }
 
           it 'returns array with local secondary' do
-            expect(selector.send(:select, candidates)).to eq([secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
           end
         end
 
@@ -301,7 +302,7 @@ describe Mongo::ServerSelector::Nearest do
           let(:expected) { [far_primary, far_secondary] }
 
           it 'returns array with both servers' do
-            expect(selector.send(:select, candidates)).to match_array(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
           end
         end
 
@@ -312,7 +313,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [primary, secondary] }
 
             it 'returns array with local primary and local secondary' do
-              expect(selector.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
             end
           end
 
@@ -321,7 +322,7 @@ describe Mongo::ServerSelector::Nearest do
             let(:expected) { [secondary, secondary] }
 
             it 'returns array with the two local secondaries' do
-              expect(selector.send(:select, candidates)).to match_array(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to match_array(expected)
             end
           end
         end