mongo 2.7.2 → 2.8.0.rc0

data/spec/mongo/server/connection_spec.rb

@@ -8,11 +8,7 @@ describe Mongo::Server::Connection, retry: 3 do
     ClientRegistry.instance.close_all_clients
   end
 
-  after(:all) do
-    ClientRegistry.instance.close_all_clients
-  end
-
-  let(:address) do
+  let!(:address) do
     default_address
   end
 
@@ -43,10 +39,9 @@ describe Mongo::Server::Connection, retry: 3 do
 
   declare_topology_double
 
+  let(:server_options) { SpecConfig.instance.test_options.merge(monitoring_io: false) }
   let(:server) do
-    Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options.merge(monitoring_io: false),
-    )
+    Mongo::Server.new(address, cluster, monitoring, listeners, server_options)
   end
 
   let(:monitored_server) do
@@ -54,6 +49,7 @@ describe Mongo::Server::Connection, retry: 3 do
       SpecConfig.instance.test_options
     ).tap do |server|
       server.scan!
+      expect(server).not_to be_unknown
     end
   end
 
@@ -142,6 +138,23 @@ describe Mongo::Server::Connection, retry: 3 do
         end
       end
 
+      shared_examples_for 'logs a warning' do
+        let(:expected_message) do
+          "MONGODB | Failed to handshake with #{address}: #{error.class}: #{error}"
+        end
+
+        it 'logs a warning' do
+          messages = []
+          # Straightforward expectations are not working here for some reason
+          expect(Mongo::Logger.logger).to receive(:warn) do |msg|
+            messages << msg
+          end
+          expect(error).not_to be nil
+          expect(messages).to include(expected_message)
+        end
+
+      end
+
       context 'when #handshake! dependency raises a non-network exception' do
 
         let(:exception) do
@@ -181,15 +194,24 @@ describe Mongo::Server::Connection, retry: 3 do
 
         it_behaves_like 'failing connection'
         it_behaves_like 'marks server unknown'
+        it_behaves_like 'logs a warning'
       end
 
       context 'when #authenticate! raises an exception' do
+        require_auth
+
+        let(:server_options) do
+          SpecConfig.instance.test_options.merge(monitoring_io: false).
+            merge(SpecConfig.instance.auth_options)
+        end
+
         let(:exception) do
           Mongo::Error::OperationFailure.new
         end
 
         let(:error) do
-          expect(connection).to receive(:authenticate!).and_raise(exception)
+          expect(Mongo::Auth).to receive(:get).and_raise(exception)
+          expect(connection.send(:socket)).to be nil
           begin
             connection.connect!
           rescue Exception => e
@@ -200,6 +222,7 @@ describe Mongo::Server::Connection, retry: 3 do
         end
 
         it_behaves_like 'failing connection'
+        it_behaves_like 'logs a warning'
       end
 
       context 'when a non-Mongo exception is raised' do
@@ -249,7 +272,7 @@ describe Mongo::Server::Connection, retry: 3 do
 
     shared_examples_for 'does not disconnect connection pool' do
       it 'does not disconnect non-monitoring sockets' do
-        allow(cluster).to receive(:pool).with(server).and_return(pool)
+        allow(server).to receive(:pool).and_return(pool)
         expect(pool).not_to receive(:disconnect!)
         error
       end
@@ -257,7 +280,7 @@ describe Mongo::Server::Connection, retry: 3 do
 
     shared_examples_for 'disconnects connection pool' do
       it 'disconnects non-monitoring sockets' do
-        expect(cluster).to receive(:pool).with(server).and_return(pool)
+        expect(server).to receive(:pool).and_return(pool)
         expect(pool).to receive(:disconnect!).and_return(true)
         error
       end
@@ -607,10 +630,6 @@ describe Mongo::Server::Connection, retry: 3 do
 
       context 'when the message is a command' do
 
-        before do
-          allow(connection).to receive(:max_bson_object_size).and_return(100)
-        end
-
         let(:selector) do
           { :getlasterror => '1' }
         end
@@ -624,29 +643,92 @@ describe Mongo::Server::Connection, retry: 3 do
         end
 
         it 'checks the size against the max bson size' do
-          expect {
+          expect_any_instance_of(Mongo::Server).to receive(:max_bson_object_size).at_least(:once).and_return(100)
+          expect do
             reply
-          }.to raise_exception(Mongo::Error::MaxBSONSize)
+          end.to raise_exception(Mongo::Error::MaxBSONSize)
         end
       end
     end
 
-    context 'when a network or socket error occurs' do
+    context 'when a network error occurs' do
+      let(:server) do
+        authorized_client.cluster.next_primary.tap do |server|
+          # to ensure the server stays in unknown state for the duration
+          # of the test, i.e. to avoid racing with the monitor thread
+          # which may put the server back into non-unknown state before
+          # we can verify that the server was marked unknown, kill off
+          # the monitor thread
+          server.monitor.instance_variable_get('@thread').kill
+        end
+      end
 
       let(:socket) do
         connection.connect!
         connection.instance_variable_get(:@socket)
       end
 
-      before do
-        expect(socket).to receive(:write).and_raise(Mongo::Error::SocketError)
+      context 'when a non-timeout socket error occurs' do
+
+        before do
+          expect(socket).to receive(:write).and_raise(Mongo::Error::SocketError)
+        end
+
+        let(:result) do
+          expect do
+            connection.dispatch([ insert ])
+          end.to raise_error(Mongo::Error::SocketError)
+        end
+
+        it 'disconnects and raises the exception' do
+          result
+          expect(connection).to_not be_connected
+        end
+
+        it 'disconnects connection pool' do
+          expect(server.pool).to receive(:disconnect!)
+          result
+        end
+
+        it 'does not request server scan' do
+          expect(server.monitor.scan_semaphore).not_to receive(:signal)
+          result
+        end
+
+        it 'marks server unknown' do
+          expect(server).not_to be_unknown
+          result
+          expect(server).to be_unknown
+        end
       end
 
-      it 'disconnects and raises the exception' do
-        expect {
-          connection.dispatch([ insert ])
-        }.to raise_error(Mongo::Error::SocketError)
-        expect(connection).to_not be_connected
+      context 'when a socket timeout occurs' do
+
+        before do
+          expect(socket).to receive(:write).and_raise(Mongo::Error::SocketTimeoutError)
+        end
+
+        let(:result) do
+          expect do
+            connection.dispatch([ insert ])
+          end.to raise_error(Mongo::Error::SocketTimeoutError)
+        end
+
+        it 'disconnects the used connection' do
+          result
+          expect(connection).to_not be_connected
+        end
+
+        it 'does not disconnect connection pool' do
+          expect(server.pool).not_to receive(:disconnect!)
+          result
+        end
+
+        it 'does not mark server unknown' do
+          expect(server).not_to be_unknown
+          result
+          expect(server).not_to be_unknown
+        end
       end
     end
 
@@ -947,4 +1029,44 @@ describe Mongo::Server::Connection, retry: 3 do
       end
     end
   end
+
+  describe '#app_metadata' do
+    context 'when all options are identical to server' do
+      let(:connection) do
+        described_class.new(server, server.options)
+      end
+
+      it 'is the same object as server app_metadata' do
+        expect(connection.app_metadata).not_to be nil
+        expect(connection.app_metadata).to be server.app_metadata
+      end
+    end
+
+    context 'when auth options are identical to server' do
+      let(:connection) do
+        described_class.new(server, server.options.merge(socket_timeout: 2))
+      end
+
+      it 'is the same object as server app_metadata' do
+        expect(connection.app_metadata).not_to be nil
+        expect(connection.app_metadata).to be server.app_metadata
+      end
+    end
+
+    context 'when auth options differ from server' do
+      let(:connection) do
+        described_class.new(server, server.options.merge(user: 'foo'))
+      end
+
+      it 'is different object from server app_metadata' do
+        expect(connection.app_metadata).not_to be nil
+        expect(connection.app_metadata).not_to be server.app_metadata
+      end
+
+      it 'includes request auth mechanism' do
+        document = connection.app_metadata.send(:document)
+        expect(document[:saslSupportedMechs]).to eq('admin.foo')
+      end
+    end
+  end
 end

data/spec/mongo/server/description_spec.rb

@@ -49,20 +49,6 @@ describe Mongo::Server::Description do
     end
   end
 
-  describe '#initialize' do
-    context 'when Time.now is mocked' do
-      it 'does not freeze mocked time' do
-        obj = Time.now
-        expect(Time).to receive(:now).at_least(:once).and_return(obj)
-        expect(obj.frozen?).to be false
-
-        description = described_class.new(address)
-        expect(description.last_update_time).to eq(obj)
-        expect(obj.frozen?).to be false
-      end
-    end
-  end
-
   describe '#arbiters' do
 
     context 'when the replica set has arbiters' do

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

@@ -158,4 +158,26 @@ describe Mongo::Server::Monitor::Connection do
       end
     end
   end
+
+  describe '#connect!' do
+    context 'network error' do
+      before do
+        address
+        server.monitor.instance_variable_get('@thread').kill
+        server.monitor.connection.disconnect!
+        expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(Mongo::Error::SocketError, 'test error')
+      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(Mongo::Logger.logger).to receive(:warn).with(expected_message).and_call_original
+        expect do
+          server.monitor.connection.connect!
+        end.to raise_error(Mongo::Error::SocketError, 'test error')
+      end
+    end
+  end
 end

data/spec/mongo/server_selector_spec.rb

@@ -218,6 +218,7 @@ describe Mongo::ServerSelector do
           allow(c).to receive(:unknown?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:options).and_return(server_selection_timeout: 0.1)
+          allow(c).to receive(:server_selection_semaphore).and_return(nil)
         end
       end
 

data/spec/mongo/server_spec.rb

@@ -25,7 +25,7 @@ describe Mongo::Server do
   end
 
   let(:pool) do
-    Mongo::Server::ConnectionPool.get(server)
+    server.pool
   end
 
   describe '#==' do
@@ -35,7 +35,7 @@ describe Mongo::Server do
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 
@@ -88,7 +88,7 @@ describe Mongo::Server do
 
     it 'stops the monitor instance' do
       expect(server.instance_variable_get(:@monitor)).to receive(:stop!).and_return(true)
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
   end
@@ -106,7 +106,7 @@ describe Mongo::Server do
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 
@@ -150,7 +150,7 @@ describe Mongo::Server do
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 
@@ -170,7 +170,7 @@ describe Mongo::Server do
     end
 
     after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(server).to receive(:pool).and_return(pool)
       server.disconnect!
     end
 

data/spec/mongo/socket/ssl_spec.rb

@@ -4,10 +4,12 @@ describe Mongo::Socket::SSL do
   require_ssl
 
   let(:address) do
-    default_address
+    default_address.tap do
+      ClientRegistry.instance.close_all_clients
+    end
   end
 
-  let(:resolver) do
+  let!(:resolver) do
     address.send(:create_resolver, {})
   end
 
@@ -47,16 +49,19 @@ describe Mongo::Socket::SSL do
     OpenSSL::PKey.read(key_string)
   end
 
+  describe '#address' do
+    it 'returns the address and tls indicator' do
+      addr = socket.instance_variable_get(:@tcp_socket).remote_address
+      expect(socket.send(:address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
+    end
+  end
+
   describe '#connect!' do
 
     context 'when a certificate is provided' do
 
       context 'when connecting the tcp socket is successful' do
 
-        before do
-          socket.connect!
-        end
-
         it 'connects to the server' do
           expect(socket).to be_alive
         end
@@ -64,21 +69,11 @@ describe Mongo::Socket::SSL do
 
       context 'when connecting the tcp socket raises an exception' do
 
-        before do
-          tcp_socket = socket.instance_variable_get(:@tcp_socket)
-          allow(tcp_socket).to receive(:connect).and_raise(Mongo::Error::SocketTimeoutError)
-        end
-
-        let!(:result) do
-          begin
-            socket.connect!
-          rescue => e
-            e
-          end
-        end
-
         it 'raises an exception' do
-          expect(result).to be_a(Mongo::Error::SocketTimeoutError)
+          expect_any_instance_of(::Socket).to receive(:connect).and_raise(Mongo::Error::SocketTimeoutError)
+          expect do
+            socket
+          end.to raise_error(Mongo::Error::SocketTimeoutError)
         end
       end
     end
@@ -94,10 +89,6 @@ describe Mongo::Socket::SSL do
         }
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'connects to the server' do
         expect(socket).to be_alive
       end
@@ -116,10 +107,6 @@ describe Mongo::Socket::SSL do
         }
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'connects to the server' do
         expect(socket).to be_alive
       end
@@ -136,10 +123,6 @@ describe Mongo::Socket::SSL do
         }
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'connects to the server' do
         expect(socket).to be_alive
       end
@@ -153,10 +136,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_cert_string' do
         expect(socket).to be_alive
@@ -171,10 +150,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_cert_object' do
         expect(socket).to be_alive
@@ -193,10 +168,6 @@ describe Mongo::Socket::SSL do
         }
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_cert_object' do
         expect(socket).to be_alive
@@ -211,10 +182,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_key_string' do
         expect(socket).to be_alive
@@ -229,10 +196,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_key_object' do
         expect(socket).to be_alive
@@ -251,10 +214,6 @@ describe Mongo::Socket::SSL do
         }
       end
 
-      before do
-        socket.connect!
-      end
-
       # since the lower priority option is clearly invalid we verify priority by checking that it connects
       it 'discards the value of :ssl_key_object' do
         expect(socket).to be_alive
@@ -274,9 +233,9 @@ describe Mongo::Socket::SSL do
       end
 
       it 'raises a TypeError' do
-        expect{
-          socket.connect!
-        }.to raise_exception(TypeError)
+        expect do
+          socket
+        end.to raise_exception(TypeError)
       end
     end
 
@@ -290,13 +249,13 @@ describe Mongo::Socket::SSL do
           error = nil
           begin
             described_class.new(
-              address.host,
-              address.port,
+              resolver.host,
+              resolver.port,
               host_name,
               30,
               ::Socket::PF_INET,
               options.merge(ssl_verify_hostname: true)
-            ).connect!
+            )
           rescue => e
             error = e
           end
@@ -310,13 +269,13 @@ describe Mongo::Socket::SSL do
         it 'raises an error' do
           expect {
             described_class.new(
-              address.host,
-              address.port,
+              resolver.host,
+              resolver.port,
               host_name,
               30,
               ::Socket::PF_INET,
               options.merge(ssl_verify_hostname: false)
-            ).connect!
+            )
           }.not_to raise_error
         end
       end
@@ -338,9 +297,9 @@ describe Mongo::Socket::SSL do
         end
 
         it 'raises a TypeError' do
-          expect{
-            socket.connect!
-          }.to raise_exception(TypeError)
+          expect do
+            socket
+          end.to raise_exception(TypeError)
         end
       end
     end
@@ -379,9 +338,9 @@ describe Mongo::Socket::SSL do
         end
 
         it 'raises a NoMethodError' do
-          expect{
-            socket.connect!
-          }.to raise_exception(expected_exception)
+          expect do
+            socket
+          end.to raise_exception(expected_exception)
         end
       end
     end
@@ -412,9 +371,9 @@ describe Mongo::Socket::SSL do
       end
 
       it 'raises an exception' do
-        expect {
-          socket.connect!
-        }.to raise_exception(expected_exception)
+        expect do
+          socket
+        end.to raise_exception(expected_exception)
       end
     end
 
@@ -430,10 +389,6 @@ describe Mongo::Socket::SSL do
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         it 'connects to the server' do
           expect(socket).to be_alive
         end
@@ -441,24 +396,20 @@ describe Mongo::Socket::SSL do
 
       context 'as a string containing the PEM-encoded certificate' do
 
-        let (:options) do
+        let(:options) do
           super().merge(
             :ssl_ca_cert_string => ca_cert_string,
             :ssl_verify => true
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         it 'connects to the server' do
           expect(socket).to be_alive
         end
       end
 
       context 'as an array of Certificate objects' do
-        let (:options) do
+        let(:options) do
           cert = [OpenSSL::X509::Certificate.new(ca_cert_string)]
           super().merge(
             :ssl_ca_cert_object => cert,
@@ -466,10 +417,6 @@ describe Mongo::Socket::SSL do
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         it 'connects to the server' do
           expect(socket).to be_alive
         end
@@ -485,10 +432,6 @@ describe Mongo::Socket::SSL do
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         # since the lower priority option is clearly invalid we verify priority by checking that it connects
         it 'discards the value of :ssl_ca_cert_string' do
           expect(socket).to be_alive
@@ -505,10 +448,6 @@ describe Mongo::Socket::SSL do
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         it 'discards the value of :ssl_ca_cert_object' do
           expect(socket).to be_alive
         end
@@ -525,10 +464,6 @@ describe Mongo::Socket::SSL do
           )
         end
 
-        before do
-          socket.connect!
-        end
-
         it 'discards the value of :ssl_ca_cert_object' do
           expect(socket).to be_alive
         end
@@ -544,9 +479,14 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
+      around do |example|
+        saved = ENV['SSL_CERT_FILE']
         ENV['SSL_CERT_FILE'] = CA_PEM
-        socket.connect!
+        begin
+          example.run
+        ensure
+          ENV['SSL_CERT_FILE'] = saved
+        end
       end
 
       it 'uses the default cert store' do
@@ -563,10 +503,6 @@ describe Mongo::Socket::SSL do
         ).tap { |options| options.delete(:ssl_verify) }
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'verifies the server certificate' do
         expect(socket).to be_alive
       end
@@ -582,10 +518,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'verifies the server certificate' do
         expect(socket).to be_alive
       end
@@ -600,10 +532,6 @@ describe Mongo::Socket::SSL do
         )
       end
 
-      before do
-        socket.connect!
-      end
-
       it 'does not verify the server certificate' do
         expect(socket).to be_alive
       end
@@ -642,9 +570,13 @@ describe Mongo::Socket::SSL do
 
       let(:socket_content) { "" }
 
+      let(:remote_address) { socket.instance_variable_get(:@tcp_socket).remote_address }
+      let(:address_str) { "#{remote_address.ip_address}:#{remote_address.ip_port} (#{default_address}, TLS)" }
+
       it 'should raise EOFError' do
-        expect { socket.readbyte }
-          .to raise_error(Mongo::Error::SocketError).with_message("EOFError: EOFError")
+        expect do
+          socket.readbyte
+        end.to raise_error(Mongo::Error::SocketError).with_message("EOFError: EOFError (for #{address_str})")
       end
     end
   end