mongo 2.7.0 → 2.7.1

data/spec/integration/bulk_insert_spec.rb

@@ -55,7 +55,7 @@ describe 'Bulk insert' do
     end
 
     context 'entire operation fails' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       require_topology :single, :replica_set
 
       it 'is an empty array' do

data/spec/integration/change_stream_examples_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'change streams examples in Ruby', if: test_change_streams? do
+describe 'change streams examples in Ruby' do
+  min_server_fcv '3.6'
+  require_topology :replica_set
 
   let!(:inventory) do
     client[:inventory]

data/spec/integration/change_stream_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'Change stream integration', retry: 4 do
   only_mri
   max_example_run_time 7
+  min_server_fcv '3.6'
+  require_topology :replica_set
 
   let(:fail_point_base_command) do
     { 'configureFailPoint' => "failCommand" }
@@ -23,12 +25,6 @@ describe 'Change stream integration', retry: 4 do
     end
   end
 
-  before do
-    unless test_change_streams?
-      skip 'Not testing change streams'
-    end
-  end
-
   describe 'watch+next' do
     let(:change_stream) { authorized_collection.watch }
 
@@ -66,7 +62,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'error on initial aggregation' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       before do
@@ -83,7 +79,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'one error on getMore' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       context 'error on first getMore' do
@@ -117,7 +113,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'two errors on getMore' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       context 'error of first getMores' do
@@ -155,7 +151,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'two errors on getMore followed by an error on aggregation' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       it 'next raises error' do
@@ -215,7 +211,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'one error on getMore' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       context 'error on first getMore' do
@@ -245,7 +241,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'two errors on getMore' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       before do
@@ -265,7 +261,7 @@ describe 'Change stream integration', retry: 4 do
     end
 
     context 'two errors on getMore followed by an error on aggregation' do
-      min_server_version '4.0'
+      min_server_fcv '4.0'
       clear_fail_point_before
 
       context 'error on first getMore' do
@@ -316,7 +312,7 @@ describe 'Change stream integration', retry: 4 do
   end
 
   describe ':start_at_operation_time option' do
-    min_server_version '4.0'
+    min_server_fcv '4.0'
 
     before do
       authorized_collection.delete_many

data/spec/integration/client_construction_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 describe 'Client construction' do
   let(:base_options) do
     SpecConfig.instance.test_options.merge(
+      server_selection_timeout: 5,
       database: SpecConfig.instance.test_db,
       user: SpecConfig.instance.test_user.name,
       password: SpecConfig.instance.test_user.password)

data/spec/integration/command_monitoring_spec.rb

@@ -68,7 +68,7 @@ describe 'Command monitoring' do
   context 'client with no established connections' do
     # for simplicity use 3.6+ servers only, then we can assert
     # scram auth commands
-    min_server_version '3.6'
+    min_server_fcv '3.6'
 
     it 'does not nest auth and find' do
       expect(subscriber.started_events.length).to eq 0
@@ -77,4 +77,40 @@ describe 'Command monitoring' do
       expect(command_names).to eq %w(saslStart saslContinue saslContinue find)
     end
   end
+
+  context 'when write concern is specified outside of command document' do
+    require_topology :replica_set
+    min_server_fcv '4.0'
+
+    let(:collection) do
+      client['command-monitoring-test']
+    end
+    let(:write_concern) { Mongo::WriteConcern.get({w: 42}) }
+    let(:session) { client.start_session }
+    let(:command) do
+      Mongo::Operation::Command.new(
+        selector: { commitTransaction: 1 },
+        db_name: 'admin',
+        session: session,
+        txn_num: 123,
+        write_concern: write_concern,
+      )
+    end
+
+    it 'includes write concern in notified command document' do
+      server = client.cluster.next_primary
+      collection.insert_one(a: 1)
+      session.start_transaction
+      collection.insert_one({a: 1}, session: session)
+
+      subscriber.clear_events!
+      expect do
+        command.execute(server)
+      end.to raise_error(Mongo::Error::OperationFailure, 'Not enough data-bearing nodes (100)')
+
+      expect(subscriber.started_events.length).to eq(1)
+      event = subscriber.started_events.first
+      expect(event.command['writeConcern']['w']).to eq(42)
+    end
+  end
 end

data/spec/integration/command_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+describe 'Command' do
+
+  let(:subscriber) { EventSubscriber.new }
+
+  describe 'payload' do
+    let(:server) { authorized_client.cluster.next_primary }
+
+    let(:payload) do
+      command.send(:final_operation, server).send(:message, server).payload.dup.tap do |payload|
+        if payload['request_id'].is_a?(Integer)
+          payload['request_id'] = 42
+        end
+        # $clusterTime may be present depending on the client's state
+        payload['command'].delete('$clusterTime')
+        # 3.6+ servers also return a payload field, earlier ones do not.
+        # The contents of this field duplicates the rest of the response
+        # so we can get rid of it without losing information.
+        payload.delete('reply')
+      end
+    end
+
+    let(:session) { nil }
+
+    context 'commitTransaction' do
+      # Although these are unit tests, when targeting pre-4.0 servers
+      # the driver does not add arguments like write concerns to commands that
+      # it adds for 4.0+ servers, breaking expectations
+      min_server_fcv '4.0'
+
+      let(:selector) do
+        { commitTransaction: 1 }.freeze
+      end
+
+      let(:write_concern) { nil }
+
+      let(:command) do
+        Mongo::Operation::Command.new(
+          selector: selector,
+          db_name: 'admin',
+          session: session,
+          txn_num: 123,
+          write_concern: write_concern,
+        )
+      end
+
+      let(:expected_payload) do
+        {
+          'command' => {'commitTransaction' => 1},
+          'command_name' => 'commitTransaction',
+          'database_name' => 'admin',
+          'request_id' => 42,
+        }
+      end
+
+      it 'returns expected payload' do
+        expect(payload).to eq(expected_payload)
+      end
+
+      context 'with session' do
+        min_server_fcv '3.6'
+
+        let(:session) { authorized_client.start_session }
+        # w will be 2 for a RS topology with 3 nodes
+        let(:w) do
+          authorized_client.write_concern.options[:w].tap do |w|
+            expect(w).to be_a(Integer)
+          end
+        end
+
+        let(:expected_payload) do
+          {
+            'command' => {
+              'commitTransaction' => 1,
+              'lsid' => session.session_id,
+              'txnNumber' => BSON::Int64.new(123),
+              'writeConcern' => {'w' => w},
+            },
+            'command_name' => 'commitTransaction',
+            'database_name' => 'admin',
+            'request_id' => 42,
+          }
+        end
+
+        it 'returns selector with write concern' do
+          expect(payload).to eq(expected_payload)
+        end
+      end
+
+      context 'with write concern' do
+        let(:write_concern) { Mongo::WriteConcern.get(w: :majority) }
+
+        let(:expected_payload) do
+          {
+            'command' => {
+              'commitTransaction' => 1,
+              'writeConcern' => {'w' => 'majority'},
+            },
+            'command_name' => 'commitTransaction',
+            'database_name' => 'admin',
+            'request_id' => 42,
+          }
+        end
+
+        it 'returns selector with write concern' do
+          expect(payload).to eq(expected_payload)
+        end
+      end
+    end
+
+    context 'find' do
+      let(:selector) do
+        { find: 'collection_name' }.freeze
+      end
+
+      let(:command) do
+        Mongo::Operation::Command.new(
+          selector: selector,
+          db_name: 'foo',
+          session: session,
+        )
+      end
+
+      let(:expected_payload) do
+        {
+          'command' => {'find' => 'collection_name'},
+          'command_name' => 'find',
+          'database_name' => 'foo',
+          'request_id' => 42,
+        }
+      end
+
+      it 'returns expected payload' do
+        expect(payload).to eq(expected_payload)
+      end
+    end
+
+  end
+
+end

data/spec/integration/connection_spec.rb

@@ -48,6 +48,8 @@ describe 'Connections' do
         it 'publishes server description changed event' do
           expect(subscriber.events).to be_empty
 
+          wait_for_all_servers(client.cluster)
+
           connection
           subscriber.events.clear
           error
@@ -94,7 +96,7 @@ describe 'Connections' do
       end
 
       context 'error during handshake to primary in a replica set' do
-        require_topology 'replica_set'
+        require_topology :replica_set
 
         let(:server) { client.cluster.servers.detect { |server| server.primary? } }
 
@@ -119,7 +121,7 @@ describe 'Connections' do
       # which is not supported by modern mongos.
       # Instead of mucking with this we just limit this test to 3.2+
       # so that we can downgrade protocol range to 0..3 instead of 0..1.
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       let(:client) { ClientRegistry.instance.global_client('authorized').with(app_name: 'wire_protocol_update') }
 

data/spec/integration/cursor_reaping_spec.rb

@@ -80,7 +80,7 @@ describe 'Cursor reaping' do
     end
 
     context 'newer servers' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       it 'is really killed' do
         cursor_id, event = cursor_id_and_kill_event

data/spec/integration/docs_examples_spec.rb

@@ -91,7 +91,7 @@ describe 'aggregation examples in Ruby' do
   end
 
   context 'Aggregation Example 4 - $lookup, $filter, $match' do
-    min_server_version '3.6'
+    min_server_fcv '3.6'
 
     let(:example_code) do
 

data/spec/integration/retryable_writes_spec.rb

@@ -299,6 +299,37 @@ describe 'Retryable writes integration tests' do
     end
   end
 
+  shared_examples_for 'operation that is retried when server supports retryable writes' do
+    context 'when the server supports retryable writes' do
+      min_server_fcv '3.6'
+
+      before do
+        allow(primary_server).to receive(:retry_writes?).and_return(true)
+      end
+
+      context 'standalone' do
+        require_topology :single
+
+        it_behaves_like 'an operation that is not retried'
+      end
+
+      context 'replica set or sharded cluster' do
+        require_topology :replica_set, :sharded
+
+        it_behaves_like 'an operation that is retried'
+      end
+    end
+
+    context 'when the server does not support retryable writes' do
+
+      before do
+        allow(primary_server).to receive(:retry_writes?).and_return(false)
+      end
+
+      it_behaves_like 'an operation that is not retried'
+    end
+  end
+
   shared_examples_for 'supported retryable writes' do
 
     context 'when the client has retry_writes set to true' do
@@ -313,27 +344,7 @@ describe 'Retryable writes integration tests' do
           client[TEST_COLL, write: SpecConfig.instance.write_concern]
         end
 
-        context 'when the server supports retryable writes' do
-
-          before do
-            allow(primary_server).to receive(:retry_writes?).and_return(true)
-          end
-
-          if standalone? && sessions_enabled?
-            it_behaves_like 'an operation that is not retried'
-          elsif sessions_enabled?
-            it_behaves_like 'an operation that is retried'
-          end
-        end
-
-        context 'when the server does not support retryable writes' do
-
-          before do
-            allow(primary_server).to receive(:retry_writes?).and_return(false)
-          end
-
-          it_behaves_like 'an operation that is not retried'
-        end
+        it_behaves_like 'operation that is retried when server supports retryable writes'
       end
 
       context 'when the collection has write concern unacknowledged' do
@@ -351,27 +362,7 @@ describe 'Retryable writes integration tests' do
           client[TEST_COLL]
         end
 
-        context 'when the server supports retryable writes' do
-
-          before do
-            allow(primary_server).to receive(:retry_writes?).and_return(true)
-          end
-
-          if standalone? && sessions_enabled?
-            it_behaves_like 'an operation that is not retried'
-          elsif sessions_enabled?
-            it_behaves_like 'an operation that is retried'
-          end
-        end
-
-        context 'when the server does not support retryable writes' do
-
-          before do
-            allow(primary_server).to receive(:retry_writes?).and_return(false)
-          end
-
-          it_behaves_like 'an operation that is not retried'
-        end
+        it_behaves_like 'operation that is retried when server supports retryable writes'
       end
     end