mongo 2.11.0.rc0 → 2.11.0

data/spec/integration/command_monitoring_spec.rb

@@ -66,10 +66,13 @@ describe 'Command monitoring' do
   end
 
   context 'client with no established connections' do
-    # for simplicity use 3.6+ servers only, then we can assert
+    # For simplicity use 3.6+ servers only, then we can assert
     # scram auth commands
     min_server_fcv '3.6'
 
+    # X.509 auth uses authenticate instead of sasl* commands
+    require_no_x509_auth
+
     it 'does not nest auth and find' do
       expect(subscriber.started_events.length).to eq 0
       client['test-collection'].find(a: 1).first

data/spec/integration/connection_pool_populator_spec.rb

@@ -21,6 +21,10 @@ describe 'Connection pool populator integration' do
 
   declare_topology_double
 
+  let(:app_metadata) do
+    Mongo::Server::AppMetadata.new(options)
+  end
+
   let(:cluster) do
     double('cluster').tap do |cl|
       allow(cl).to receive(:topology).and_return(topology)

data/spec/integration/connection_spec.rb

@@ -158,8 +158,10 @@ describe 'Connections' do
         RSpec::Mocks.with_temporary_scope do
           # now pretend an ismaster returned a different range
           features = Mongo::Server::Description::Features.new(0..3)
-          # the second Features instantiation is for SDAM event publication
-          expect(Mongo::Server::Description::Features).to receive(:new).twice.and_return(features)
+          # One Features instantiation is for SDAM event publication, this
+          # one always happens. The second one happens on servers
+          # where we do not negotiate auth mechanism.
+          expect(Mongo::Server::Description::Features).to receive(:new).at_least(:once).and_return(features)
 
           connection = Mongo::Server::Connection.new(server, server.options)
           expect(connection.connect!).to be true

data/spec/integration/cursor_reaping_spec.rb

@@ -59,7 +59,7 @@ describe 'Cursor reaping' do
       client.cluster.instance_variable_get('@periodic_executor').execute
 
       started_event = EventSubscriber.started_events.detect do |event|
-        event.command['killCursors'] && event.command['cursors'].include?(cursor_id)
+        event.command['killCursors'] && event.command['cursors'].map(&:value).include?(cursor_id)
       end
 
       expect(started_event).not_to be_nil

data/spec/integration/get_more_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'getMore operation' do
+  # https://jira.mongodb.org/browse/RUBY-1987
+  min_server_fcv '3.2'
+
+  let(:collection) do
+    subscribed_client['get_more_spec']
+  end
+
+  let(:scope) do
+    collection.find.batch_size(1).each
+  end
+
+  before do
+    collection.delete_many
+    collection.insert_one(a: 1)
+    #collection.insert_one(a: 2)
+    EventSubscriber.clear_events!
+  end
+
+  let(:get_more_command) do
+    event = EventSubscriber.single_command_started_event('getMore')
+    event.command['getMore']
+  end
+
+  it 'sends cursor id as int64' do
+    scope.to_a
+
+    expect(get_more_command).to be_a(BSON::Int64)
+  end
+end

data/spec/integration/retryable_errors_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe 'Retryable writes tests' do
+  # Requirement for fail point
+  min_server_fcv '4.0'
+
+  let(:client) do
+    subscribed_client
+  end
+
+  let(:collection) do
+    client['retryable-writes-error-spec']
+  end
+
+  context 'when retry fails' do
+    require_topology :replica_set
+
+    let(:fail_point_command) do
+      {
+        configureFailPoint: 'failCommand',
+        mode: {times: 1},
+        data: {
+          failCommands: ['find'],
+          errorCode: 11600,
+        },
+      }
+    end
+
+    let(:clear_fail_point_command) do
+      {
+        configureFailPoint: 'failCommand',
+        mode: 'off',
+      }
+    end
+
+    after do
+      ClusterTools.instance.direct_client_for_each_server do |client|
+        client.use(:admin).database.command(clear_fail_point_command)
+      end
+    end
+
+    let(:collection) do
+      client['retryable-writes-error-spec', read: {mode: :secondary_preferred}]
+    end
+
+    let(:events) do
+      events = EventSubscriber.command_started_events('find')
+    end
+
+    let(:first_server) do
+      client.cluster.servers_list.detect do |server|
+        server.address.seed == events.first.address.seed
+      end
+    end
+
+    let(:second_server) do
+      client.cluster.servers_list.detect do |server|
+        server.address.seed == events.last.address.seed
+      end
+    end
+
+    let(:perform_read) do
+      client.cluster.servers_list.each do |server|
+        server.monitor.stop!
+      end
+
+      ClusterTools.instance.direct_client_for_each_server do |client|
+        client.use(:admin).database.command(fail_point_command)
+      end
+
+      begin
+        collection.find(a: 1).to_a
+      rescue Mongo::Error::OperationFailure => @exception
+      else
+        fail('Expected operation to fail')
+      end
+
+      puts @exception.message
+
+      expect(events.length).to eq(2)
+      expect(events.first.address.seed).not_to eq(events.last.address.seed)
+    end
+
+    it 'is reported on the server of the second attempt' do
+      perform_read
+
+      expect(@exception.message).not_to include(first_server.address.seed)
+      expect(@exception.message).to include(second_server.address.seed)
+    end
+
+    it 'marks servers used in both attempts unknown' do
+      perform_read
+
+      expect(first_server).to be_unknown
+
+      expect(second_server).to be_unknown
+    end
+  end
+end

data/spec/integration/retryable_writes_errors_spec.rb

@@ -1,7 +1,16 @@
 require 'spec_helper'
 
 describe 'Retryable writes errors tests' do
-  describe 'when the storage engine does not support retryable writes but the server does' do
+
+  let(:client) do
+    authorized_client.with(retry_writes: true)
+  end
+
+  let(:collection) do
+    client['retryable-writes-error-spec']
+  end
+
+  context 'when the storage engine does not support retryable writes but the server does' do
     require_mmapv1
     min_server_fcv '3.6'
     require_topology :replica_set, :sharded
@@ -10,14 +19,6 @@ describe 'Retryable writes errors tests' do
       collection.delete_many
     end
 
-    let(:collection) do
-      client[authorized_collection.name]
-    end
-
-    let(:client) do
-      authorized_client.with(retry_writes: true)
-    end
-
     context 'when a retryable write is attempted' do
       it 'raises an actionable error message' do
         expect {
@@ -27,4 +28,4 @@ describe 'Retryable writes errors tests' do
       end
     end
   end
-end
+end

data/spec/lite_spec_helper.rb

@@ -47,6 +47,7 @@ else
   PossiblyConcurrentArray = Array
 end
 
+require 'support/utils'
 require 'support/spec_config'
 
 Mongo::Logger.logger = Logger.new($stdout)
@@ -68,6 +69,7 @@ require 'support/sdam_monitoring'
 require 'support/crud'
 require 'support/command_monitoring'
 require 'support/cmap'
+require 'runners/connection_string'
 require 'support/connection_string'
 require 'support/gridfs'
 require 'support/transactions'
@@ -77,7 +79,6 @@ require 'support/client_registry'
 require 'support/client_registry_macros'
 require 'support/json_ext_formatter'
 require 'support/sdam_formatter_integration'
-require 'support/utils'
 require 'support/background_thread_registry'
 require 'support/auth'
 

data/spec/mongo/auth/scram_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Auth::SCRAM do
+  require_no_x509_auth
 
   let(:server) do
     authorized_client.cluster.next_primary

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

@@ -7,7 +7,46 @@ describe Mongo::Auth::User::View do
   end
 
   before do
-    begin; view.remove('durran'); rescue; end
+    # Separate view instance to not interfere with test assertions
+    view = described_class.new(root_authorized_client.database)
+    begin
+      view.remove('durran')
+    rescue Mongo::Error::OperationFailure
+    end
+  end
+
+  shared_context 'testing write concern' do
+
+    let(:subscriber) do
+      EventSubscriber.new
+    end
+
+    let(:client) do
+      root_authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+    end
+
+    let(:view) do
+      described_class.new(client.database)
+    end
+
+    before do
+      allow_any_instance_of(Mongo::Monitoring::Event::CommandStarted).to receive(:redacted) do |instance, command_name, document|
+        document
+      end
+    end
+  end
+
+  shared_examples_for 'forwards write concern to server' do
+    # w:2 requires more than one node in the deployment
+    require_topology :replica_set
+
+    it 'forwards write concern to server' do
+      response
+
+      expect(event.command['writeConcern']).to eq('w' => 2)
+    end
   end
 
   describe '#create' do
@@ -73,6 +112,25 @@ describe Mongo::Auth::User::View do
 
       it_behaves_like 'an operation using a session'
     end
+
+    context 'when write concern is given' do
+      include_context 'testing write concern'
+
+      let(:response) do
+        view.create(
+          'durran',
+          password: 'password',
+          roles: [Mongo::Auth::Roles::READ_WRITE],
+          write_concern: {w: 2},
+        )
+      end
+
+      let(:event) do
+        subscriber.single_command_started_event('createUser')
+      end
+
+      it_behaves_like 'forwards write concern to server'
+    end
   end
 
   describe '#update' do
@@ -183,6 +241,25 @@ describe Mongo::Auth::User::View do
         it_behaves_like 'an operation using a session'
       end
     end
+
+    context 'when write concern is given' do
+      include_context 'testing write concern'
+
+      let(:response) do
+        view.update(
+          'durran',
+          password: 'password1',
+          roles: [Mongo::Auth::Roles::READ_WRITE],
+          write_concern: {w: 2},
+        )
+      end
+
+      let(:event) do
+        subscriber.single_command_started_event('updateUser')
+      end
+
+      it_behaves_like 'forwards write concern to server'
+    end
   end
 
   describe '#remove' do
@@ -260,6 +337,30 @@ describe Mongo::Auth::User::View do
         it_behaves_like 'a failed operation using a session'
       end
     end
+
+    context 'when write concern is given' do
+      include_context 'testing write concern'
+
+      before do
+        view.create(
+            'durran',
+            password: 'password', roles: [ Mongo::Auth::Roles::READ_WRITE ]
+        )
+      end
+
+      let(:response) do
+        view.remove(
+          'durran',
+          write_concern: {w: 2},
+        )
+      end
+
+      let(:event) do
+        subscriber.single_command_started_event('dropUser')
+      end
+
+      it_behaves_like 'forwards write concern to server'
+    end
   end
 
   describe '#info' do

data/spec/mongo/auth/user_spec.rb

@@ -10,6 +10,24 @@ describe Mongo::Auth::User do
     described_class.new(options)
   end
 
+  shared_examples_for 'sets database and auth source to admin' do
+
+    it 'sets database to admin' do
+      expect(user.database).to eq('admin')
+    end
+
+    it 'sets auth source to admin' do
+      expect(user.auth_source).to eq('admin')
+    end
+  end
+
+  shared_examples_for 'sets auth source to $external' do
+
+    it 'sets auth source to $external' do
+      expect(user.auth_source).to eq('$external')
+    end
+  end
+
   describe '#initialize' do
     let(:user) { Mongo::Auth::User.new(options) }
 
@@ -19,6 +37,8 @@ describe Mongo::Auth::User do
       it 'succeeds' do
         expect(user).to be_a(Mongo::Auth::User)
       end
+
+      it_behaves_like 'sets database and auth source to admin'
     end
 
     context 'invalid mechanism' do
@@ -45,6 +65,8 @@ describe Mongo::Auth::User do
         it 'converts mechanism to symbol' do
           expect(user.mechanism).to eq(:scram)
         end
+
+        it_behaves_like 'sets database and auth source to admin'
       end
 
       context 'linting' do
@@ -69,6 +91,40 @@ describe Mongo::Auth::User do
       it 'stores mechanism' do
         expect(user.mechanism).to eq(:scram)
       end
+
+      it_behaves_like 'sets database and auth source to admin'
+    end
+
+    context 'mechanism is x509' do
+      let(:options) { {auth_mech: :mongodb_x509} }
+
+      it 'sets database to admin' do
+        expect(user.database).to eq('admin')
+      end
+
+      it_behaves_like 'sets auth source to $external'
+
+      context 'database is explicitly given' do
+        let(:options) { {auth_mech: :mongodb_x509, database: 'foo'} }
+
+        it 'sets database to the specified one' do
+          expect(user.database).to eq('foo')
+        end
+
+        it_behaves_like 'sets auth source to $external'
+      end
+    end
+
+    it 'sets the database' do
+      expect(user.database).to eq('testing')
+    end
+
+    it 'sets the name' do
+      expect(user.name).to eq('user')
+    end
+
+    it 'sets the password' do
+      expect(user.password).to eq('pass')
     end
   end
 
@@ -131,21 +187,6 @@ describe Mongo::Auth::User do
     end
   end
 
-  describe '#initialize' do
-
-    it 'sets the database' do
-      expect(user.database).to eq('testing')
-    end
-
-    it 'sets the name' do
-      expect(user.name).to eq('user')
-    end
-
-    it 'sets the password' do
-      expect(user.password).to eq('pass')
-    end
-  end
-
   describe '#hashed_password' do
 
     let(:expected) do