mongo 2.15.0 → 2.16.0.alpha1

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

data/spec/mongo/cluster_spec.rb

@@ -41,6 +41,34 @@ describe Mongo::Cluster do
       end
     end
 
+    context 'when topology is load-balanced' do
+      require_topology :load_balanced
+
+      it 'emits SDAM events' do
+        allow(monitoring).to receive(:succeeded)
+
+        register_cluster(
+          described_class.new(
+            SpecConfig.instance.addresses,
+            monitoring,
+            SpecConfig.instance.test_options
+            )
+          )
+
+          expect(monitoring).to have_received(:succeeded).with(
+            Mongo::Monitoring::TOPOLOGY_OPENING, any_args
+          )
+          expect(monitoring).to have_received(:succeeded).with(
+            Mongo::Monitoring::TOPOLOGY_CHANGED, any_args
+          ).twice
+          expect(monitoring).to have_received(:succeeded).with(
+            Mongo::Monitoring::SERVER_OPENING, any_args
+          )
+          expect(monitoring).to have_received(:succeeded).with(
+            Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, any_args
+          )
+      end
+    end
   end
 
   describe '#==' do
@@ -334,7 +362,7 @@ describe Mongo::Cluster do
       end
 
       let(:monitoring) { Mongo::Monitoring.new }
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       it 'publishes server closed event once' do
         monitoring.subscribe(Mongo::Monitoring::SERVER_CLOSED, subscriber)
@@ -425,7 +453,7 @@ describe Mongo::Cluster do
     end
 
     let(:primary_candidates) do
-      if cluster.single?
+      if cluster.single? || cluster.load_balanced?
         cluster.servers
       elsif cluster.sharded?
         cluster.servers
@@ -611,7 +639,17 @@ describe Mongo::Cluster do
             monitoring_io: false, server_selection_timeout: 0.183))
       end
 
-      it_behaves_like 'does not support sessions'
+      context 'in load-balanced topology' do
+        require_topology :load_balanced
+
+        it_behaves_like 'supports sessions'
+      end
+
+      context 'not in load-balanced topology' do
+        require_topology :single, :replica_set, :sharded
+
+        it_behaves_like 'does not support sessions'
+      end
     end
 
     context 'when client has contacted servers and then disconnected' do
@@ -761,6 +799,9 @@ describe Mongo::Cluster do
     let(:default_address) { SpecConfig.instance.addresses.first }
 
     context 'cluster has unknown servers' do
+      # Servers are never unknown in load-balanced topology.
+      require_topology :single, :replica_set, :sharded
+
       it 'includes unknown servers' do
         cluster.servers_list.each do |server|
           expect(server).to be_unknown

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -235,7 +235,7 @@ describe Mongo::Collection::View::Aggregation do
         { session: session }
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|

data/spec/mongo/collection/view/builder/find_command_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'lite_spec_helper'
 
 describe Mongo::Collection::View::Builder::FindCommand do
@@ -522,3 +525,4 @@ describe Mongo::Collection::View::Builder::FindCommand do
     end
   end
 end
+=end

data/spec/mongo/collection/view/builder/op_query_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Collection::View::Builder::OpQuery do
@@ -155,3 +158,4 @@ describe Mongo::Collection::View::Builder::OpQuery do
     end
   end
 end
+=end

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -242,7 +242,7 @@ describe Mongo::Collection::View::MapReduce do
             Mongo::Collection::View.new(client[TEST_COLL], selector, view_options)
           end
 
-          let(:subscriber) { EventSubscriber.new }
+          let(:subscriber) { Mrss::EventSubscriber.new }
 
           let(:client) do
             authorized_client.tap do |client|

data/spec/mongo/collection_crud_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
@@ -1894,6 +1894,11 @@ describe Mongo::Collection do
     context 'when a session supporting causal consistency is used' do
       require_wired_tiger
 
+      before do
+        collection.drop
+        collection.create
+      end
+
       let(:cursors) do
         collection.parallel_scan(2, session: session)
       end
@@ -4352,7 +4357,7 @@ describe Mongo::Collection do
         expect(command[:writeConcern]).to_not be_nil
         expect(command[:writeConcern][:w]).to eq(1)
         expect(command[:upsert]).to be(true)
-        expect(command[:bypassDocumentValidation]).to be_nil
+        expect(command[:bypassDocumentValidation]).to be false
         expect(command[:maxTimeMS]).to eq(200)
       end
     end

data/spec/mongo/collection_ddl_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/collection_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/cursor/builder/get_more_command_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::GetMoreCommand do
@@ -189,3 +192,4 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
     end
   end
 end
+=end

data/spec/mongo/cursor/builder/op_get_more_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::OpGetMore do
@@ -62,3 +65,4 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
   end
 end
+=end

data/spec/mongo/cursor_spec.rb

@@ -80,6 +80,8 @@ describe Mongo::Cursor do
     end
 
     context 'server is unknown' do
+      require_topology :single, :replica_set, :sharded
+
       let(:server) do
         view.send(:server_selector).select_server(authorized_client.cluster).tap do |server|
           authorized_client.cluster.disconnect!
@@ -329,8 +331,7 @@ describe Mongo::Cursor do
 
       before do
         authorized_collection.insert_many(documents)
-        cluster.schedule_kill_cursor(cursor.id,
-                                     cursor.send(:kill_cursors_op_spec),
+        cluster.schedule_kill_cursor(cursor.kill_spec,
                                      cursor.instance_variable_get(:@server))
       end
 
@@ -429,7 +430,7 @@ describe Mongo::Cursor do
 
       it 'removes the cursor id from the active cursors tracked by the cluster cursor manager' do
         enum.next
-        expect(cursor_reaper.instance_variable_get(:@active_cursors)).not_to include(cursor_id)
+        expect(cursor_reaper.instance_variable_get(:@active_cursor_ids)).not_to include(cursor_id)
       end
     end
   end
@@ -437,7 +438,7 @@ describe Mongo::Cursor do
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:subscribed_client) do
       authorized_client.tap do |client|
@@ -555,8 +556,17 @@ describe Mongo::Cursor do
         db_name: SpecConfig.instance.test_db, coll_name: TEST_COLL }
     end
 
+    let(:conn_desc) do
+      double('connection description').tap do |cd|
+        allow(cd).to receive(:service_id).and_return(nil)
+      end
+    end
+
     let(:reply) do
-      Mongo::Operation::Find.new(query_spec).tap do |reply|
+      double('reply').tap do |reply|
+        allow(reply).to receive(:is_a?).with(Mongo::Operation::Result).and_return(true)
+        allow(reply).to receive(:namespace)
+        allow(reply).to receive(:connection_description).and_return(conn_desc)
         allow(reply).to receive(:cursor_id).and_return(42)
       end
     end