mongo 2.10.5 → 2.11.0.rc0

data/spec/spec_tests/data/transactions/abort.yml

@@ -305,10 +305,10 @@ tests:
           document:
             _id: 1
         result:
-          # Don't assert on errorCodeName because (after SERVER-38583) the
-          # DuplicateKey is reported in writeErrors, not as a top-level
-          # command error.
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
+          # DuplicateKey error code included in the bulk write error message
+          # returned by the server
+          errorContains: E11000
       # Make sure the server aborted the transaction.
       - name: insertOne
         object: collection

data/spec/spec_tests/data/transactions/error-labels.yml

@@ -25,10 +25,10 @@ tests:
             - _id: 1
             - _id: 1
         result:
-          # Don't assert on errorCodeName because (after SERVER-38583) the
-          # DuplicateKey is reported in writeErrors, not as a top-level
-          # command error.
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
+          # DuplicateKey error code included in the bulk write error message
+          # returned by the server
+          errorContains: E11000
       - name: abortTransaction
         object: session0
 

data/spec/spec_tests/data/transactions_api/callback-retry.yml

@@ -160,10 +160,10 @@ tests:
                 result:
                   errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
         result:
-          # Don't assert on errorCodeName because (after SERVER-38583) the
-          # DuplicateKey is reported in writeErrors, not as a top-level
-          # command error.
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
+          # DuplicateKey error code included in the bulk write error message
+          # returned by the server
+          errorContains: E11000
     expectations:
       -
         command_started_event:

data/spec/spec_tests/data/uri_options/auth-options.yml

@@ -1,6 +1,6 @@
 tests:
     -
-        description: "Valid auth options are parsed correctly"
+        description: "Valid auth options are parsed correctly (GSSAPI)"
         uri: "mongodb://foo:bar@example.com/?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true&authSource=$external"
         valid: true
         warning: false

data/spec/spec_tests/max_staleness_spec.rb

@@ -56,6 +56,8 @@ describe 'Max Staleness Spec' do
           allow(c).to receive(:options).and_return(options)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:app_metadata).and_return(app_metadata)
+          allow(c).to receive(:heartbeat_interval).and_return(
+            spec.heartbeat_frequency || Mongo::Server::Monitor::HEARTBEAT_FREQUENCY)
         end
       end
 
@@ -66,7 +68,9 @@ describe 'Max Staleness Spec' do
             allow(feat).to receive(:check_driver_support!).and_return(true)
           end
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, cluster, monitoring, listeners, options).tap do |s|
+          Mongo::Server.new(address, cluster, monitoring, listeners,
+            {monitoring_io: false}.update(options)
+          ).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0) if server['avg_rtt_ms']
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -83,7 +87,8 @@ describe 'Max Staleness Spec' do
 
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
-          Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners, options.merge(monitor: false))
+          Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners,
+            options.merge(monitoring_io: false))
         end
       end
 

data/spec/spec_tests/retryable_reads_spec.rb

@@ -12,34 +12,3 @@ describe 'Retryable reads spec tests' do
     end
   end
 end
-
-describe 'Retryable reads spec tests - legacy' do
-  require_no_multi_shard
-
-  define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
-    let(:client_options) do
-      {
-        max_read_retries: 1,
-        read_retry_interval: 0,
-        retry_reads: false,
-      }.update(test.client_options)
-    end
-
-    let(:client) do
-      authorized_client.with(client_options).tap do |client|
-        client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
-      end
-    end
-
-    around do |example|
-      desc = example.full_description
-      # Skip tests that disable modern retryable reads because they expect
-      # no retries - and since legacy retryable reads are used, the tests
-      # will fail.
-      if desc =~/retryReads is false|fails on first attempt/
-        skip 'Test not applicable to legacy read retries'
-      end
-      example.run
-    end
-  end
-end

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -1,7 +1,5 @@
 require 'lite_spec_helper'
 
-require_relative '../runners/sdam/verifier'
-
 describe 'SDAM Monitoring' do
   include Mongo::SDAM
 
@@ -31,11 +29,17 @@ describe 'SDAM Monitoring' do
         @servers_cache = {}
         @client.cluster.servers_list.each do |server|
           @servers_cache[server.address.to_s] = server
+
+          # Since we set monitoring_io: false, servers are not monitored
+          # by the cluster. Start monitoring on them manually (this publishes
+          # the server opening event but, again due to monitoring_io being
+          # false, does not do network I/O or change server status)>
+          server.start_monitoring
         end
       end
 
       after(:all) do
-        @client.close(true)
+        @client.close
       end
 
       spec.phases.each_with_index do |phase, phase_index|
@@ -59,8 +63,7 @@ describe 'SDAM Monitoring' do
               result['maxWireVersion'] ||= 0
               new_description = Mongo::Server::Description.new(
                 server.description.address, result, 0.5)
-              publisher = SdamSpecEventPublisher.new(@client.cluster.send(:event_listeners))
-              publisher.publish(Mongo::Event::DESCRIPTION_CHANGED, server.description, new_description)
+              @client.cluster.run_sdam_flow(server.description, new_description)
             end
             @subscriber.phase_finished(phase_index)
           end
@@ -69,15 +72,12 @@ describe 'SDAM Monitoring' do
             expect(@subscriber.phase_events(phase_index).length).to eq(phase.outcome.events.length)
           end
 
-          let(:verifier) do
-            Sdam::Verifier.new
-          end
-
           phase.outcome.events.each_with_index do |expectation, index|
 
-            it "expects event #{index+1} to be #{expectation.name}" do
-              verifier.verify_sdam_event(
-                phase.outcome.events, @subscriber.phase_events(phase_index), index)
+            it "expects a #{expectation.name} to be published" do
+              published_event = @subscriber.phase_events(phase_index)[index]
+              expect(published_event).not_to be_nil
+              expect(published_event).to match_sdam_monitoring_event(expectation)
             end
           end
         end

data/spec/spec_tests/sdam_spec.rb

@@ -29,14 +29,12 @@ describe 'Server Discovery and Monitoring' do
       before(:all) do
         # Since we supply all server descriptions and drive events,
         # background monitoring only gets in the way. Disable it.
-        @client = Mongo::Client.new(spec.uri_string, monitoring_io: false)
-        client_options = @client.instance_variable_get(:@options)
-        @client.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
-        @client.cluster.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
+        @client = new_local_client_nmio(spec.uri_string,
+          heartbeat_frequency: 1000, connect_timeout: 0.1)
       end
 
       after(:all) do
-        @client && @client.close(true)
+        @client && @client.close
       end
 
       spec.phases.each_with_index do |phase, index|
@@ -66,8 +64,7 @@ describe 'Server Discovery and Monitoring' do
               result['maxWireVersion'] ||= 0
               new_description = Mongo::Server::Description.new(
                 server.description.address, result, 0.5)
-              publisher = SdamSpecEventPublisher.new(@client.cluster.send(:event_listeners))
-              publisher.publish(Mongo::Event::DESCRIPTION_CHANGED, server.description, new_description)
+              @client.cluster.run_sdam_flow(server.description, new_description)
             end
           end
 

data/spec/spec_tests/server_selection_spec.rb

@@ -53,7 +53,9 @@ describe 'Server Selection' do
       let(:candidate_servers) do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options).tap do |s|
+          Mongo::Server.new(address, cluster, monitoring, listeners,
+            {monitoring_io: false}.update(SpecConfig.instance.test_options)
+          ).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -67,7 +69,9 @@ 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, cluster, monitoring, listeners, SpecConfig.instance.test_options).tap do |s|
+          Mongo::Server.new(address, cluster, monitoring, listeners,
+            {monitoring_io: false}.update(SpecConfig.instance.test_options)
+          ).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:connectable?).and_return(true)

data/spec/spec_tests/transactions_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
 describe 'Transactions' do
-  clean_slate_on_evergreen
-
   define_transactions_spec_tests(TRANSACTIONS_TESTS)
 end

data/spec/spec_tests/uri_options_spec.rb

@@ -1,4 +1,4 @@
-require 'lite_spec_helper'
+require 'spec_helper'
 
 describe 'Uri Options' do
   include Mongo::ConnectionString
@@ -17,8 +17,10 @@ describe 'Uri Options' do
       end
 
       spec.tests.each do |test|
-
         context "#{test.description}" do
+          if test.description.downcase.include?("gssapi")
+            require_mongo_kerberos
+          end
 
           context 'when the uri should warn', if: test.warn? do
 

data/spec/stress/connection_pool_stress_spec.rb

@@ -0,0 +1,203 @@
+require 'spec_helper'
+
+describe 'Connection pool stress test' do
+  before(:all) do
+    if !SpecConfig.instance.stress_spec?
+      skip 'Stress spec not enabled'
+    end
+  end
+
+  let(:options) do
+    { max_pool_size: 5, min_pool_size: 3 }
+  end
+
+  let(:thread_count) { 5 }
+
+  let(:documents) do
+    [].tap do |documents|
+      10000.times do |i|
+        documents << { a: i}
+      end
+    end
+  end
+
+  let(:operation_threads) do
+    [].tap do |threads|
+      thread_count.times do |i|
+        threads << Thread.new do
+          10.times do |j|
+            collection.find(a: i+j).to_a
+            sleep 0.5
+            collection.find(a: i+j).to_a
+          end
+        end
+      end
+    end
+  end
+
+  let(:client) do
+    authorized_client.with(options)
+  end
+
+  let(:collection) do
+    client[authorized_collection.name].tap do |collection|
+      collection.drop
+      collection.insert_many(documents)
+    end
+  end
+
+  shared_examples_for 'does not raise error' do
+    it 'does not raise error' do
+      collection
+
+      expect {
+        threads.collect { |t| t.join }
+      }.not_to raise_error
+    end
+  end
+
+  describe 'when several threads run operations on the collection' do
+    let(:threads) { operation_threads }
+
+    context 'min pool size 0, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 0 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context 'min pool size 1, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 1 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context 'min pool size 2, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 2 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context 'min pool size 3, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 3 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context 'min pool size 4, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 4 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context 'min pool size 5, max pool size 5' do
+      let(:options) do
+        { max_pool_size: 5, min_pool_size: 5 }
+      end
+      let(:thread_count) { 7 }
+
+      it_behaves_like 'does not raise error'
+    end
+  end
+
+  describe 'when there are many more threads than the max pool size' do
+    let(:threads) { operation_threads }
+
+    context '10 threads, max pool size 5' do
+      let(:thread_count) { 10 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context '15 threads, max pool size 5' do
+      let(:thread_count) { 15 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context '20 threads, max pool size 5' do
+      let(:thread_count) { 20 }
+
+      it_behaves_like 'does not raise error'
+    end
+
+    context '25 threads, max pool size 5' do
+      let(:thread_count) { 20 }
+
+      it_behaves_like 'does not raise error'
+    end
+  end
+
+  context 'when primary pool is disconnected' do
+    let(:threads) do
+      threads = operation_threads
+
+      # thread that disconnects primary's pool
+      threads << Thread.new do
+        sleep 0.2
+        server = client.cluster.next_primary
+        server.pool.disconnect!
+      end
+    end
+
+    it_behaves_like 'does not raise error'
+  end
+
+  context 'when all pools are disconnected' do
+    let(:threads) do
+      threads = operation_threads
+
+      # thread that disconnects each server's pool
+      threads << Thread.new do
+        sleep 0.2
+
+        client.cluster.servers_list.each do |server|
+          if server.description.data_bearing?
+            server.pool.disconnect!
+          end
+        end
+      end
+    end
+
+    it_behaves_like 'does not raise error'
+  end
+
+  context 'when populator connection auth sometimes fails' do
+    let(:threads) { operation_threads }
+
+    it 'does not raise error' do
+      server = client.cluster.next_primary
+
+      # We only want to test connection failure on the populator; connection failures
+      # occurring in the check_out method should raise an error.
+      # The populator calls create_and_add_connection, which calls connection.connect!
+      # and raises if an error occurs (eg, an auth error), so in this test we
+      # randomly raise errors on this method.
+      expect(server.pool).to receive(:create_and_add_connection).at_least(:once).and_wrap_original { |m, *args|
+        if rand < 0.05
+          raise Mongo::Error::SocketError
+        else
+          m.call(*args)
+        end
+      }
+
+      expect {
+        threads.collect { |t| t.join }
+      }.not_to raise_error
+    end
+  end
+end