mongo 2.15.0 → 2.16.1

data/spec/lite_spec_helper.rb

@@ -16,7 +16,6 @@ RETRYABLE_READS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_read
 COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml").sort
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml").sort
 URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml").sort
-DNS_SEEDLIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/dns_seedlist_discovery/*.yml").sort
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml").sort
 TRANSACTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions/*.yml").sort
 TRANSACTIONS_API_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions_api/*.yml").sort
@@ -78,7 +77,7 @@ end
 
 require 'mrss/lite_constraints'
 require 'support/matchers'
-require 'support/event_subscriber'
+require 'mrss/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
 require 'support/client_registry_macros'

data/spec/mongo/address/unix_spec.rb

@@ -28,6 +28,7 @@ describe Mongo::Address::Unix do
   end
 
   describe '#socket' do
+    require_unix_socket
 
     let(:address) do
       "/tmp/mongodb-#{SpecConfig.instance.any_port}.sock"

data/spec/mongo/auth/cr_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::CR do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::CR do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   describe '#login' do
 

data/spec/mongo/auth/ldap_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::LDAP do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::LDAP do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   let(:user) do
     Mongo::Auth::User.new(

data/spec/mongo/auth/scram_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::Scram do
   require_no_external_user
@@ -10,9 +11,7 @@ describe Mongo::Auth::Scram do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.monitoring_options)
-  end
+  include_context 'auth unit tests'
 
   let(:cache_mod) { Mongo::Auth::CredentialCache }
 

data/spec/mongo/auth/user/view_spec.rb

@@ -23,7 +23,7 @@ describe Mongo::Auth::User::View do
   shared_context 'testing write concern' do
 
     let(:subscriber) do
-      EventSubscriber.new
+      Mrss::EventSubscriber.new
     end
 
     let(:client) do

data/spec/mongo/auth/x509_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::X509 do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::X509 do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   let(:user) do
     Mongo::Auth::User.new(database: '$external')

data/spec/mongo/bulk_write_spec.rb

@@ -1424,7 +1424,7 @@ describe Mongo::BulkWrite do
 
               # In a multi-sharded cluster, the write seems to go to a
               # different shard from the read
-              require_no_multi_shard
+              require_no_multi_mongos
 
               let(:extra_options) do
                 { write_concern: { w: 0 } }
@@ -2103,10 +2103,10 @@ describe Mongo::BulkWrite do
 
             # In a multi-shard cluster, retries may go to a different server
             # than original command which these tests are not prepared to handle
-            require_no_multi_shard
+            require_no_multi_mongos
 
 
-            let(:subscriber) { EventSubscriber.new }
+            let(:subscriber) { Mrss::EventSubscriber.new }
 
             let(:client) do
               authorized_client_with_retry_writes.tap do |client|

data/spec/mongo/client_construction_spec.rb

@@ -6,7 +6,7 @@ require 'spec_helper'
 describe Mongo::Client do
   clean_slate
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   describe '.new' do
     context 'with scan: false' do
@@ -24,26 +24,8 @@ describe Mongo::Client do
     end
 
     context 'with default scan: true' do
-      # TODO this test requires there being no outstanding background
-      # monitoring threads running, as otherwise the scan! expectation
-      # can be executed on a thread that belongs to one of the global
-      # clients for instance
-      it 'performs one round of sdam' do
-        # Does not work due to
-        # https://github.com/rspec/rspec-mocks/issues/1242.
-        #expect_any_instance_of(Mongo::Server::Monitor).to receive(:scan!).
-        #  exactly(SpecConfig.instance.addresses.length).times.and_call_original
-        c = new_local_client(
-          SpecConfig.instance.addresses, SpecConfig.instance.test_options)
-        expect(c.cluster.servers).not_to be_empty
-      end
-
-      # This checks the case of all initial seeds being removed from
-      # cluster during SDAM
-      context 'me mismatch on the only initial seed' do
-        let(:address) do
-          ClusterConfig.instance.alternate_address.to_s
-        end
+
+      shared_examples 'does not wait for server selection timeout' do
 
         let(:logger) do
           Logger.new(STDOUT, level: Logger::DEBUG)
@@ -94,6 +76,7 @@ describe Mongo::Client do
             Mongo::Cluster::Topology::ReplicaSetWithPrimary,
             Mongo::Cluster::Topology::Single,
             Mongo::Cluster::Topology::Sharded,
+            Mongo::Cluster::Topology::LoadBalanced,
           ]).to include(actual_class)
           expect(time_taken).to be < 5
 
@@ -101,6 +84,44 @@ describe Mongo::Client do
           client.database.command(ping: 1)
         end
       end
+
+      context 'when cluster is monitored' do
+        require_topology :single, :replica_set, :sharded
+
+        # TODO this test requires there being no outstanding background
+        # monitoring threads running, as otherwise the scan! expectation
+        # can be executed on a thread that belongs to one of the global
+        # clients for instance
+        it 'performs one round of sdam' do
+          # Does not work due to
+          # https://github.com/rspec/rspec-mocks/issues/1242.
+          #expect_any_instance_of(Mongo::Server::Monitor).to receive(:scan!).
+          #  exactly(SpecConfig.instance.addresses.length).times.and_call_original
+          c = new_local_client(
+            SpecConfig.instance.addresses, SpecConfig.instance.test_options)
+          expect(c.cluster.servers).not_to be_empty
+        end
+
+        # This checks the case of all initial seeds being removed from
+        # cluster during SDAM
+        context 'me mismatch on the only initial seed' do
+          let(:address) do
+            ClusterConfig.instance.alternate_address.to_s
+          end
+
+          include_examples 'does not wait for server selection timeout'
+        end
+      end
+
+      context 'when cluster is not monitored' do
+        require_topology :load_balanced
+
+        let(:address) do
+          ClusterConfig.instance.alternate_address.to_s
+        end
+
+        include_examples 'does not wait for server selection timeout'
+      end
     end
 
     context 'with monitoring_io: false' do
@@ -388,10 +409,24 @@ describe Mongo::Client do
             end.should_not raise_error
           end
 
-          it 'fails server selection due to very small timeout' do
-            lambda do
-              client.database.command(ping: 1)
-            end.should raise_error(Mongo::Error::NoServerAvailable)
+          context 'non-lb' do
+            require_topology :single, :replica_set, :sharded
+
+            it 'fails server selection due to very small timeout' do
+              lambda do
+                client.database.command(ping: 1)
+              end.should raise_error(Mongo::Error::NoServerAvailable)
+            end
+          end
+
+          context 'lb' do
+            require_topology :load_balanced
+
+            it 'fails the operation after successful server selection' do
+              lambda do
+                client.database.command(ping: 1)
+              end.should raise_error(Mongo::Error::SocketTimeoutError, /socket took over.*to connect/)
+            end
           end
         end
 
@@ -412,7 +447,7 @@ describe Mongo::Client do
             end.should_not raise_error
           end
 
-          it 'fails operations due to very small timeout' do
+          it 'fails operations due to very small timeout', retry: 3 do
             lambda do
               client.database.command(ping: 1)
             end.should raise_error(Mongo::Error::SocketTimeoutError)
@@ -1292,6 +1327,192 @@ describe Mongo::Client do
             client.options[:connect].should be :sharded
           end
         end
+
+        context 'load_balanced: true and multiple seeds' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017', '127.0.0.2:27017'],
+              load_balanced: true)
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /load_balanced=true cannot be used with multiple seeds/)
+          end
+        end
+
+        context 'load_balanced: false and multiple seeds' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017', '127.0.0.2:27017'],
+              load_balanced: false)
+          end
+
+          it 'is accepted' do
+            lambda do
+              client
+            end.should_not raise_error
+            client.options[:load_balanced].should be false
+          end
+        end
+
+        context 'load_balanced: true and direct_connection: true' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+              load_balanced: true, direct_connection: true)
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /direct_connection=true cannot be used with load_balanced=true/)
+          end
+        end
+
+        context 'load_balanced: true and direct_connection: false' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+              load_balanced: true, direct_connection: false)
+          end
+
+          it 'is accepted' do
+            lambda do
+              client
+            end.should_not raise_error
+            client.options[:load_balanced].should be true
+            client.options[:direct_connection].should be false
+          end
+        end
+
+        context 'load_balanced: false and direct_connection: true' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+              load_balanced: false, direct_connection: true)
+          end
+
+          it 'is accepted' do
+            lambda do
+              client
+            end.should_not raise_error
+            client.options[:load_balanced].should be false
+            client.options[:direct_connection].should be true
+          end
+        end
+
+        [:direct, 'direct', :sharded, 'sharded'].each do |v|
+          context "load_balanced: true and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                load_balanced: true, connect: v)
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /connect=#{v} cannot be used with load_balanced=true/)
+            end
+          end
+        end
+
+        [nil].each do |v|
+          context "load_balanced: true and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                load_balanced: true, connect: v)
+            end
+
+            it 'is accepted' do
+              lambda do
+                client
+              end.should_not raise_error
+              client.options[:load_balanced].should be true
+              client.options[:connect].should eq v
+            end
+          end
+        end
+
+        [:load_balanced, 'load_balanced'].each do |v|
+          context "load_balanced: true and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                load_balanced: true, connect: v)
+            end
+
+            it 'is accepted' do
+              lambda do
+                client
+              end.should_not raise_error
+              client.options[:load_balanced].should be true
+              client.options[:connect].should eq v
+            end
+          end
+
+          context "replica_set and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                replica_set: 'foo', connect: v)
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /connect=load_balanced cannot be used with replica_set option/)
+            end
+          end
+
+          context "direct_connection=true and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                direct_connection: true, connect: v)
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /Conflicting client options: direct_connection=true and connect=load_balanced/)
+            end
+          end
+
+          context "multiple seed addresses and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017', '127.0.0.1:1234'],
+                connect: v)
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /connect=load_balanced cannot be used with multiple seeds/)
+            end
+          end
+        end
+
+        [:replica_set, 'replica_set'].each do |v|
+          context "load_balanced: true and connect: #{v.inspect}" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                load_balanced: true, connect: v, replica_set: 'x')
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /connect=replica_set cannot be used with load_balanced=true/)
+            end
+          end
+
+          context "load_balanced: true and #{v.inspect} option" do
+            let(:client) do
+              new_local_client_nmio(['127.0.0.1:27017'],
+                load_balanced: true, v => 'rs')
+            end
+
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /load_balanced=true cannot be used with replica_set option/)
+            end
+          end
+        end
       end
 
       context ':bg_error_backtrace option' do
@@ -2306,7 +2527,12 @@ describe Mongo::Client do
       before do
         client.cluster.next_primary
         events = subscriber.select_started_events(Mongo::Monitoring::Event::ServerHeartbeatStarted)
-        events.length.should > 0
+        if ClusterConfig.instance.topology == :load_balanced
+          # No server monitoring in LB topology
+          events.length.should == 0
+        else
+          events.length.should > 0
+        end
       end
 
       it 'does not copy sdam_proc option to new client' do
@@ -2318,7 +2544,12 @@ describe Mongo::Client do
         # Give those some time to be processed.
         sleep 2
 
-        expect(subscriber.started_events.length).to be > 0
+        if ClusterConfig.instance.topology == :load_balanced
+          # No server monitoring in LB topology
+          expect(subscriber.started_events.length).to eq 0
+        else
+          expect(subscriber.started_events.length).to be > 0
+        end
         subscriber.started_events.clear
 
         # If this test takes longer than heartbeat interval,

data/spec/mongo/client_spec.rb

@@ -635,7 +635,7 @@ describe Mongo::Client do
         root_authorized_client.options.merge(heartbeat_frequency: 100, monitoring: true)
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         ClientRegistry.instance.new_local_client(
@@ -939,13 +939,15 @@ describe Mongo::Client do
     end
 
     context 'monitoring present' do
+      require_topology :single, :replica_set, :sharded
+
       let(:client) do
         authorized_client
       end
 
       it 'does not indicate lack of monitoring' do
-        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS)/
-        client.summary.should_not =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+        client.summary.should =~ /servers=.*(?:STANDALONE|PRIMARY|MONGOS)/
+        client.summary.should_not =~ /servers=.*(?:STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
       end
     end
 
@@ -957,7 +959,7 @@ describe Mongo::Client do
       end
 
       it 'does not indicate lack of monitoring' do
-        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS|\bLB\b).*NO-MONITORING/
       end
     end
   end

data/spec/mongo/cluster/cursor_reaper_spec.rb

@@ -5,16 +5,18 @@ require 'spec_helper'
 
 describe Mongo::Cluster::CursorReaper do
 
+  let(:cluster) { double('cluster') }
+
   before do
     authorized_collection.drop
   end
 
   let(:reaper) do
-    described_class.new
+    described_class.new(cluster)
   end
 
-  let(:active_cursors) do
-    reaper.instance_variable_get(:@active_cursors)
+  let(:active_cursor_ids) do
+    reaper.instance_variable_get(:@active_cursor_ids)
   end
 
   describe '#intialize' do
@@ -24,16 +26,29 @@ describe Mongo::Cluster::CursorReaper do
     end
 
     it 'initializes a set for the list of active cursors' do
-      expect(reaper.instance_variable_get(:@active_cursors)).to be_a(Set)
+      expect(reaper.instance_variable_get(:@active_cursor_ids)).to be_a(Set)
     end
   end
 
   describe '#schedule_kill_cursor' do
 
-    let(:server) { double('server') }
+    let(:address) { Mongo::Address.new('localhost') }
+    let(:server) do
+      double('server').tap do |server|
+        allow(server).to receive(:address).and_return(address)
+      end
+    end
     let(:cursor_id) { 1 }
-    let(:op_spec_1) { double('op_spec_1') }
-    let(:op_spec_2) { double('op_spec_2') }
+    let(:cursor_kill_spec_1) do
+      Mongo::Cursor::KillSpec.new(
+        cursor_id: cursor_id, coll_name: 'c', db_name: 'd', service_id: nil,
+      )
+    end
+    let(:cursor_kill_spec_2) do
+      Mongo::Cursor::KillSpec.new(
+        cursor_id: cursor_id, coll_name: 'c', db_name: 'q', service_id: nil,
+      )
+    end
     let(:to_kill) { reaper.instance_variable_get(:@to_kill)}
 
     context 'when the cursor is on the list of active cursors' do
@@ -45,36 +60,36 @@ describe Mongo::Cluster::CursorReaper do
       context 'when there is not a list already for the server' do
 
         before do
-          reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+          reaper.schedule_kill_cursor(cursor_kill_spec_1, server)
         end
 
         it 'initializes the list of op specs to a set' do
-          expect(to_kill.keys).to eq([ server ])
-          expect(to_kill[server]).to eq(Set.new([op_spec_1]))
+          expect(to_kill.keys).to eq([ address.seed ])
+          expect(to_kill[address.seed]).to eq(Set.new([cursor_kill_spec_1]))
         end
       end
 
       context 'when there is a list of ops already for the server' do
 
         before do
-          reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
-          reaper.schedule_kill_cursor(cursor_id, op_spec_2, server)
+          reaper.schedule_kill_cursor(cursor_kill_spec_1, server)
+          reaper.schedule_kill_cursor(cursor_kill_spec_2, server)
         end
 
         it 'adds the op to the server list' do
-          expect(to_kill.keys).to eq([ server ])
-          expect(to_kill[server]).to contain_exactly(op_spec_1, op_spec_2)
+          expect(to_kill.keys).to eq([ address.seed ])
+          expect(to_kill[address.seed]).to contain_exactly(cursor_kill_spec_1, cursor_kill_spec_2)
         end
 
         context 'when the same op is added more than once' do
 
           before do
-            reaper.schedule_kill_cursor(cursor_id, op_spec_2, server)
+            reaper.schedule_kill_cursor(cursor_kill_spec_2, server)
           end
 
           it 'does not allow duplicates ops for a server' do
-            expect(to_kill.keys).to eq([ server ])
-            expect(to_kill[server]).to contain_exactly(op_spec_1, op_spec_2)
+            expect(to_kill.keys).to eq([ address.seed ])
+            expect(to_kill[address.seed]).to contain_exactly(cursor_kill_spec_1, cursor_kill_spec_2)
           end
         end
       end
@@ -83,7 +98,7 @@ describe Mongo::Cluster::CursorReaper do
     context 'when the cursor is not on the list of active cursors' do
 
       before do
-        reaper.schedule_kill_cursor(cursor_id, op_spec_1, server)
+        reaper.schedule_kill_cursor(cursor_kill_spec_1, server)
       end
 
       it 'does not add the kill cursors op spec to the list' do
@@ -131,7 +146,7 @@ describe Mongo::Cluster::CursorReaper do
       end
 
       it 'registers the cursor id as active' do
-        expect(active_cursors).to eq(Set.new([2]))
+        expect(active_cursor_ids).to eq(Set.new([2]))
       end
     end
   end
@@ -146,7 +161,7 @@ describe Mongo::Cluster::CursorReaper do
       end
 
       it 'removes the cursor id' do
-        expect(active_cursors.size).to eq(0)
+        expect(active_cursor_ids.size).to eq(0)
       end
     end
   end
@@ -174,7 +189,7 @@ describe Mongo::Cluster::CursorReaper do
     around do |example|
       authorized_collection.insert_many(docs)
       periodic_executor.stop!
-      cluster.schedule_kill_cursor(cursor.id, cursor.send(:kill_cursors_op_spec),
+      cluster.schedule_kill_cursor(cursor.kill_spec,
                                    cursor.instance_variable_get(:@server))
       periodic_executor.flush
       example.run

data/spec/mongo/cluster/periodic_executor_spec.rb

@@ -5,8 +5,10 @@ require 'spec_helper'
 
 describe Mongo::Cluster::PeriodicExecutor do
 
+  let(:cluster) { double('cluster') }
+
   let(:executor) do
-    described_class.new
+    described_class.new(cluster)
   end
 
   describe '#log_warn' do