mongo 2.12.4 → 2.13.0.beta1

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

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::PrimaryPreferred 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

data/spec/mongo/server_selector/primary_spec.rb

@@ -50,6 +50,24 @@ describe Mongo::ServerSelector::Primary do
     end
   end
 
+  describe '#hedge' do
+    context 'hedge not provided' do
+      it 'returns an empty array' do
+        expect(selector.hedge).to be_nil
+      end
+    end
+
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'raises an error' do
+        expect {
+          selector.tag_sets
+        }.to raise_error(Mongo::Error::InvalidServerPreference)
+      end
+    end
+  end
+
   describe '#to_mongos' do
 
     it 'returns nil' do

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 
@@ -107,10 +108,26 @@ describe Mongo::ServerSelector::SecondaryPreferred do
         expect(selector.to_mongos).to eq(expected)
       end
     end
+
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'returns a formatted read preference' do
+        expect(selector.to_mongos).to eq({ mode: 'secondaryPreferred', hedge: { enabled: true } })
+      end
+    end
+
+    context 'hedge not provided' do
+      let(:hedge) { nil }
+
+      it 'returns nil' do
+        expect(selector.to_mongos).to be_nil
+      end
+    end
+
   end
 
   describe '#select' do
-
     context 'no candidates' do
       let(:candidates) { [] }
 

data/spec/mongo/server_selector/secondary_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::Secondary do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 

data/spec/mongo/server_selector_spec.rb

@@ -313,7 +313,6 @@ describe Mongo::ServerSelector do
 
       it 'uses the local_threshold of the cluster' do
         expect(topology).to receive(:compatible?).and_return(true)
-        expect(topology).to receive(:single?).and_return(false)
         expect(read_pref.select_server(cluster)).to eq(near_server)
       end
     end

data/spec/mongo/session/session_pool_spec.rb

@@ -157,8 +157,12 @@ describe Mongo::Session::SessionPool do
       pool.checkout
     end
 
+    let(:subscriber) { EventSubscriber.new }
+
     let(:client) do
-      subscribed_client
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
     end
 
     context 'when the number of ids is not larger than 10,000' do
@@ -175,7 +179,7 @@ describe Mongo::Session::SessionPool do
 
       let(:end_sessions_command) do
         pool.end_sessions
-        EventSubscriber.started_events.find { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.find { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the endSessions command with all the session ids' do
@@ -219,7 +223,7 @@ describe Mongo::Session::SessionPool do
       end
 
       let(:end_sessions_commands) do
-        EventSubscriber.started_events.select { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.select { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the command more than once' do

data/spec/mongo/socket/ssl_spec.rb

@@ -42,10 +42,10 @@ describe Mongo::Socket::SSL, retry: 3 do
     OpenSSL::PKey.read(key_string)
   end
 
-  describe '#address' do
+  describe '#human_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)")
+      expect(socket.send(:human_address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
     end
   end
 

data/spec/mongo/socket/tcp_spec.rb

@@ -5,10 +5,10 @@ describe Mongo::Socket::TCP do
     described_class.new('127.0.0.1', SpecConfig.instance.any_port, 5, Socket::AF_INET)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the address and tls indicator' do
       addr = socket.send(:socket).remote_address
-      expect(socket.send(:address)).to eq("#{addr.ip_address}:#{addr.ip_port} (no TLS)")
+      expect(socket.send(:human_address)).to eq("#{addr.ip_address}:#{addr.ip_port} (no TLS)")
     end
   end
 end

data/spec/mongo/socket/unix_spec.rb

@@ -8,9 +8,9 @@ describe Mongo::Socket::Unix do
     described_class.new(path, 5)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the path' do
-      expect(socket.send(:address)).to eq(path)
+      expect(socket.send(:human_address)).to eq(path)
     end
   end
 

data/spec/mongo/socket_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 describe Mongo::Socket do
 
   let(:socket) do
-    described_class.new
+    described_class.new(0, {})
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'raises NotImplementedError' do
       expect do
-        socket.send(:address)
+        socket.send(:human_address)
       end.to raise_error(NotImplementedError)
     end
   end
 
-  describe '#handle_errors' do
+  describe '#map_exceptions' do
     before do
-      expect(socket).to receive(:address).and_return('fake-address')
+      expect(socket).to receive(:human_address).and_return('fake-address')
     end
 
     it 'maps timeout exception' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise Errno::ETIMEDOUT
         end
       end.to raise_error(Mongo::Error::SocketTimeoutError)
@@ -29,7 +29,7 @@ describe Mongo::Socket do
 
     it 'maps SystemCallError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise SystemCallError.new('Test error', Errno::ENFILE::Errno)
         end
       end.to raise_error(Mongo::Error::SocketError, 'Errno::ENFILE: Too many open files in system - Test error (for fake-address)')
@@ -37,7 +37,7 @@ describe Mongo::Socket do
 
     it 'maps IOError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise IOError.new('Test error')
         end
       end.to raise_error(Mongo::Error::SocketError, 'IOError: Test error (for fake-address)')
@@ -45,7 +45,7 @@ describe Mongo::Socket do
 
     it 'maps SSLError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise OpenSSL::SSL::SSLError.new('Test error')
         end
       end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address) (MongoDB may not be configured with SSL support)')