mongo 2.0.6 → 2.1.0

data/spec/mongo/server/connection_pool_spec.rb

@@ -2,20 +2,36 @@ require 'spec_helper'
 
 describe Mongo::Server::ConnectionPool do
 
+  let(:options) do
+    TEST_OPTIONS.merge(max_pool_size: 2)
+  end
+
   let(:address) do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
   describe '#checkin' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
       described_class.get(server)
     end
 
+    after do
+      server.disconnect!
+    end
+
     context 'when a connection is checked out on the thread' do
 
       let!(:connection) do
@@ -39,7 +55,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#checkout' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -71,7 +87,7 @@ describe Mongo::Server::ConnectionPool do
     context 'when a connection is checked out on a different thread' do
 
       let!(:connection) do
-        Thread.new { pool.checkout }.value
+        Thread.new { pool.checkout }.join
       end
 
       it 'returns a new connection' do
@@ -84,16 +100,40 @@ describe Mongo::Server::ConnectionPool do
     end
   end
 
+  describe '#disconnect!' do
+
+    let(:server) do
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+    end
+
+    let!(:pool) do
+      described_class.get(server)
+    end
+
+    after do
+      server.disconnect!
+    end
+
+    it 'disconnects the queue' do
+      expect(pool.send(:queue)).to receive(:disconnect!).twice.and_call_original
+      pool.disconnect!
+    end
+  end
+
   describe '.get' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
       described_class.get(server)
     end
 
+    after do
+      server.disconnect!
+    end
+
     it 'returns the pool for the server' do
       expect(pool).to eql(described_class.get(server))
     end
@@ -102,13 +142,17 @@ describe Mongo::Server::ConnectionPool do
   describe '#inspect' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do
       described_class.get(server)
     end
 
+    after do
+      server.disconnect!
+    end
+
     it 'includes the object id' do
       expect(pool.inspect).to include(pool.object_id.to_s)
     end
@@ -121,7 +165,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#with_connection' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
     end
 
     let!(:pool) do

data/spec/mongo/server/connection_spec.rb

@@ -6,8 +6,53 @@ describe Mongo::Server::Connection do
     Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
   let(:server) do
-    Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, ssl: SSL)
+    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
+  end
+
+  after do
+    server.disconnect!
+  end
+
+  describe '#connectable?' do
+
+    # context 'when the connection is connectable' do
+
+    #   let(:connection) do
+    #     described_class.new(server)
+    #   end
+
+    #   it 'returns true' do
+    #     expect(connection).to be_connectable
+    #   end
+    # end
+
+    context 'when the connection is not connectable' do
+
+      let(:bad_address) do
+        Mongo::Address.new('127.0.0.1:666')
+      end
+
+      let(:bad_server) do
+        Mongo::Server.new(bad_address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
+      end
+
+      let(:connection) do
+        described_class.new(bad_server)
+      end
+
+      it 'returns false' do
+        expect(connection).to_not be_connectable
+      end
+    end
   end
 
   describe '#connect!' do
@@ -164,7 +209,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'it dispatchs the message to the socket' do
@@ -187,7 +232,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'it dispatchs the message to the socket' do
@@ -225,7 +270,7 @@ describe Mongo::Server::Connection do
       end
 
       after do
-        authorized_collection.find.delete_many
+        authorized_collection.delete_many
       end
 
       it 'disconnects the connection' do

data/spec/mongo/server/description_spec.rb

@@ -31,6 +31,10 @@ describe Mongo::Server::Description do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:monitoring) do
+    Mongo::Monitoring.new
+  end
+
   describe '#arbiter?' do
 
     context 'when the server is an arbiter' do
@@ -583,7 +587,7 @@ describe Mongo::Server::Description do
     end
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), listeners)
+      Mongo::Server.new(address, double('cluster'), monitoring, listeners)
     end
 
     let(:description) do
@@ -604,7 +608,7 @@ describe Mongo::Server::Description do
       end
 
       let(:server) do
-        Mongo::Server.new(other_address, double('cluster'), listeners)
+        Mongo::Server.new(other_address, double('cluster'), monitoring, listeners)
       end
 
       it 'returns false' do
@@ -613,6 +617,48 @@ describe Mongo::Server::Description do
     end
   end
 
+  describe '#me_mismatch?' do
+
+    let(:description) do
+      described_class.new(address, config)
+    end
+
+    context 'when the server address matches the me field' do
+
+      let(:config) do
+        replica.merge('me' => address.to_s)
+      end
+
+      it 'returns false' do
+        expect(description.me_mismatch?).to be(false)
+      end
+    end
+
+    context 'when the server address does not match the me field' do
+
+      let(:config) do
+        replica.merge('me' => 'localhost:27020')
+      end
+
+      it 'returns true' do
+        expect(description.me_mismatch?).to be(true)
+      end
+    end
+
+    context 'when there is no me field' do
+
+      let(:config) do
+        replica.tap do |r|
+          r.delete('me')
+        end
+      end
+
+      it 'returns false' do
+        expect(description.me_mismatch?).to be(false)
+      end
+    end
+  end
+
   describe '#lists_server?' do
 
     let(:description) do
@@ -628,7 +674,7 @@ describe Mongo::Server::Description do
     end
 
     let(:server) do
-      Mongo::Server.new(server_address, double('cluster'), listeners)
+      Mongo::Server.new(server_address, double('cluster'), monitoring, listeners)
     end
 
     context 'when the server is included in the description hosts list' do

data/spec/mongo/server/monitor_spec.rb

@@ -141,4 +141,55 @@ describe Mongo::Server::Monitor do
       expect(monitor.description).to_not be_nil
     end
   end
+
+  describe '#restart!' do
+
+    let(:monitor) do
+      described_class.new(address, listeners, TEST_OPTIONS)
+    end
+
+    let!(:thread) do
+      monitor.run!
+    end
+
+    context 'when the monitor is already running' do
+
+      it 'does not create a new thread' do
+        expect(monitor.restart!).to be(thread)
+      end
+    end
+
+    context 'when the monitor is not already running' do
+
+      before do
+        monitor.stop!
+        sleep(1)
+      end
+
+      it 'creates a new thread' do
+        expect(monitor.restart!).not_to be(thread)
+      end
+    end
+  end
+
+  describe '#stop' do
+
+    let(:monitor) do
+      described_class.new(address, listeners, TEST_OPTIONS)
+    end
+
+    let!(:thread) do
+      monitor.run!
+    end
+
+    before do
+      expect(monitor.connection).to receive(:disconnect!).and_call_original
+      monitor.stop!
+      sleep(1)
+    end
+
+    it 'kills the monitor thread' do
+      expect(thread.stop?).to be(true)
+    end
+  end
 end

data/spec/mongo/server_discovery_and_monitoring_spec.rb

@@ -11,39 +11,26 @@ describe 'Server Discovery and Monitoring' do
 
       before(:all) do
 
-        # We monkey-patch the address, so that looking up the spec's hostname does
-        # not throw an error.
-        #
-        # @since 2.0.0
-        class Mongo::Address
-          private
-
-          def family(host)
-            fam = host == 'localhost' ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-            ::Socket.getaddrinfo(host, nil, fam, ::Socket::SOCK_STREAM).first[4]
-          rescue SocketError
-          end
-        end
+        module Mongo
+          # We monkey-patch the server here, so the monitors do not run and no
+          # real TCP connection is attempted. Thus we can control the server
+          # descriptions per-phase.
+          #
+          # @since 2.0.0
+          class Server
+
+            alias :original_initialize :initialize
+            def initialize(address, cluster, monitoring, event_listeners, options = {})
+              @address = address
+              @cluster = cluster
+              @monitoring = monitoring
+              @options = options.freeze
+              @monitor = Monitor.new(address, event_listeners, options)
+            end
 
-        # We monkey-patch the server here, so the monitors do not run and no
-        # real TCP connection is attempted. Thus we can control the server
-        # descriptions per-phase.
-        #
-        # @since 2.0.0
-        class Mongo::Server
-
-          # The constructor keeps the same API, but does not instantiate a
-          # monitor and run it.
-          def initialize(address, cluster, event_listeners, options = {})
-            @address = address
-            @cluster = cluster
-            @options = options.freeze
-            @monitor = Monitor.new(address, event_listeners, options)
+            alias :original_disconnect! :disconnect!
+            def disconnect!; true; end
           end
-
-          # Disconnect simply needs to return true since we have no monitor and
-          # no connection.
-          def disconnect!; true; end
         end
 
         # Client is set as an instance variable inside the scope of the spec to
@@ -53,36 +40,17 @@ describe 'Server Discovery and Monitoring' do
       end
 
       after(:all) do
+        @client.close
 
         # Return the server implementation to its original for the other
         # tests in the suite.
-        class Mongo::Server
-
-          # Returns the constructor to its original implementation.
-          def initialize(address, cluster, event_listeners, options = {})
-            @address = address
-            @cluster = cluster
-            @options = options.freeze
-            @monitor = Monitor.new(address, event_listeners, options)
-            @monitor.scan!
-            @monitor.run!
-          end
-
-          # Returns disconnect! to its original implementation.
-          def disconnect!
-            context.with_connection do |connection|
-              connection.disconnect!
-            end
-            @monitor.stop! and true
-          end
-        end
-
-        class Mongo::Address
-          private
+        module Mongo
+          class Server
+            alias :initialize :original_initialize
+            remove_method(:original_initialize)
 
-          def family(host)
-            fam = host == 'localhost' ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-            ::Socket.getaddrinfo(host, nil, fam, ::Socket::SOCK_STREAM).first[4]
+            alias :disconnect! :original_disconnect!
+            remove_method(:original_disconnect!)
           end
         end
       end
@@ -96,8 +64,13 @@ describe 'Server Discovery and Monitoring' do
               # For each response in the phase, we need to change that server's
               # description.
               server = find_server(@client, response.address)
-              server = Mongo::Server.new(Mongo::Address.new(response.address), @client.cluster,
-                                         @client.cluster.send(:event_listeners), @client.cluster.options) unless server
+              server = Mongo::Server.new(
+                Mongo::Address.new(response.address),
+                @client.cluster,
+                @client.instance_variable_get(:@monitoring),
+                @client.cluster.send(:event_listeners),
+                @client.cluster.options
+              ) unless server
               monitor = server.instance_variable_get(:@monitor)
               description = monitor.inspector.run(server.description, response.ismaster, 0.5)
               monitor.instance_variable_set(:@description, description)

data/spec/mongo/server_selection_rtt_spec.rb

@@ -8,80 +8,60 @@ describe 'Server Selection moving average round trip time calculation' do
 
     spec = Mongo::ServerSelection::RTT::Spec.new(file)
 
-    before(:all) do
-
-      module Mongo
-        class Server
-
-          # We monkey-patch the monitor here, so the last average rtt can be controlled.
-          # We keep the API of Monitor#initialize but add in an extra option and set the last rtt.
-          #
-          # @since 2.0.0
-          class Monitor
-
-            def initialize(address, listeners, options = {})
-              @description = Mongo::Server::Description.new(address, {})
-              @inspector = Mongo::Server::Description::Inspector.new(listeners)
-              @options = options.freeze
-              @connection = Connection.new(address, options)
-              @last_round_trip_time = options[:avg_rtt_ms]
-              @mutex = Mutex.new
-            end
+    context(spec.description) do
 
-            private
+      before(:all) do
 
-            # We monkey patch this method to use an instance variable instead of calculating time elapsed.
+        module Mongo
+          class Server
+
+            # We monkey-patch the monitor here, so the last average rtt can be controlled.
+            # We keep the API of Monitor#initialize but add in an extra option and set the last rtt.
             #
             # @since 2.0.0
-            def average_round_trip_time(start)
-              new_rtt = @new_rtt_ms
-              RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+            class Monitor
+
+              alias :original_initialize :initialize
+              def initialize(address, listeners, options = {})
+                @description = Mongo::Server::Description.new(address, {})
+                @inspector = Mongo::Server::Description::Inspector.new(listeners)
+                @options = options.freeze
+                @connection = Connection.new(address, options)
+                @last_round_trip_time = options[:avg_rtt_ms]
+                @mutex = Mutex.new
+              end
+
+              # We monkey patch this method to use an instance variable instead of calculating time elapsed.
+              #
+              # @since 2.0.0
+              alias :original_average_round_trip_time :average_round_trip_time
+              def average_round_trip_time(start)
+                new_rtt = @new_rtt_ms
+                RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+              end
             end
           end
         end
       end
-    end
 
-    after(:all) do
+      after(:all) do
 
-      module Mongo
-        class Server
+        module Mongo
+          class Server
 
-          # Return the monitor implementation to its original for the other
-          # tests in the suite.
-          class Monitor
+            # Return the monitor implementation to its original for the other
+            # tests in the suite.
+            class Monitor
 
-            # Create the new server monitor.
-            #
-            # @example Create the server monitor.
-            #   Mongo::Server::Monitor.new(address, listeners)
-            #
-            # @param [ Address ] address The address to monitor.
-            # @param [ Event::Listeners ] listeners The event listeners.
-            # @param [ Hash ] options The options.
-            #
-            # @since 2.0.0
-            def initialize(address, listeners, options = {})
-              @description = Description.new(address, {})
-              @inspector = Description::Inspector.new(listeners)
-              @options = options.freeze
-              @connection = Connection.new(address, options)
-              @last_round_trip_time = nil
-              @mutex = Mutex.new
-            end
-
-            private
+              alias :initialize :original_initialize
+              remove_method(:original_initialize)
 
-            def average_round_trip_time(start)
-              new_rtt = Time.now - start
-              RTT_WEIGHT_FACTOR * new_rtt + (1 - RTT_WEIGHT_FACTOR) * (@last_round_trip_time || new_rtt)
+              alias :average_round_trip_time :original_average_round_trip_time
+              remove_method(:original_average_round_trip_time)
             end
           end
         end
       end
-    end
-
-    context(spec.description) do
 
       let(:address) do
         Mongo::Address.new('127.0.0.1:27017')

data/spec/mongo/server_selection_spec.rb

@@ -14,6 +14,14 @@ describe 'Server Selection' do
         spec.type.new({})
       end
 
+      let(:monitoring) do
+        Mongo::Monitoring.new
+      end
+
+      let(:listeners) do
+        Mongo::Event::Listeners.new
+      end
+
       let(:cluster) do
         double('cluster').tap do |c|
           allow(c).to receive(:topology).and_return(topology)
@@ -26,11 +34,12 @@ describe 'Server Selection' do
       let(:candidate_servers) do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
+            allow(s).to receive(:connectable?).and_return(true)
           end
         end
       end
@@ -38,17 +47,18 @@ describe 'Server Selection' do
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, double('cluster'), Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
+          Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
+            allow(s).to receive(:connectable?).and_return(true)
           end
         end
       end
 
       let(:server_selector) do
-        Mongo::ServerSelector.get({ :mode => spec.read_preference['mode'],
-                                    :tag_sets => spec.read_preference['tag_sets'] },
-                                    :server_selection_timeout => 1)
+        Mongo::ServerSelector.get(:mode => spec.read_preference['mode'],
+                                  :tag_sets => spec.read_preference['tag_sets'],
+                                  :server_selection_timeout => 1)
       end
 
       before do
@@ -57,18 +67,18 @@ describe 'Server Selection' do
       end
 
       context 'Valid read preference and matching server available', if: spec.server_available? do
-      
+
         it 'Finds all suitable servers in the latency window', if: spec.replica_set? do
-          expect(server_selector.send(:select, cluster.servers)).to eq(in_latency_window)   
+          expect(server_selector.send(:select, cluster.servers)).to eq(in_latency_window)
         end
-      
+
         it 'Finds the most suitable server in the latency window' do
           expect(in_latency_window).to include(server_selector.select_server(cluster))
         end
       end
 
       context 'No matching server available', if: !spec.server_available? do
-      
+
         it 'Raises exception' do
           expect do
             server_selector.select_server(cluster)