mongo 2.15.0 → 2.16.1

data/spec/spec_tests/data/seed_list_discovery/replica-set/loadBalanced-false-txt.yml

@@ -0,0 +1,10 @@
+uri: "mongodb+srv://test21.test.build.10gen.cc/"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    loadBalanced: false
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-admin-database.yml

@@ -0,0 +1,13 @@
+uri: "mongodb+srv://test1.test.build.10gen.cc/adminDB?replicaSet=repl0"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    replicaSet: repl0
+    ssl: true
+parsed_options:
+    auth_database: adminDB

data/spec/spec_tests/data/seed_list_discovery/replica-set/uri-with-auth.yml

@@ -0,0 +1,12 @@
+uri: "mongodb+srv://auser:apass@test1.test.build.10gen.cc/?replicaSet=repl0"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+parsed_options:
+    user: auser
+    password: apass
+comment: Should preserve auth credentials

data/spec/spec_tests/data/transactions/retryable-abort-errorLabels.yml

@@ -2,6 +2,8 @@ runOn:
     -
         minServerVersion: "4.3.1"
         topology: ["replicaset", "sharded"]
+        # https://jira.mongodb.org/browse/RUBY-2776
+        serverless: forbid
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

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

@@ -5,6 +5,8 @@ runOn:
     -
         minServerVersion: "4.1.8"
         topology: ["sharded"]
+        # https://jira.mongodb.org/browse/RUBY-2776
+        serverless: forbid
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/retryable-commit-errorLabels.yml

@@ -2,6 +2,8 @@ runOn:
     -
         minServerVersion: "4.3.1"
         topology: ["replicaset", "sharded"]
+        # https://jira.mongodb.org/browse/RUBY-2776
+        serverless: forbid
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/retryable-commit.yml

@@ -5,6 +5,8 @@ runOn:
     -
         minServerVersion: "4.1.8"
         topology: ["sharded"]
+        # https://jira.mongodb.org/browse/RUBY-2776
+        serverless: forbid
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/retryable-writes.yml

@@ -5,6 +5,8 @@ runOn:
     -
         minServerVersion: "4.1.8"
         topology: ["sharded"]
+        # https://jira.mongodb.org/browse/RUBY-2776
+        serverless: forbid
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

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

@@ -147,3 +147,63 @@ tests:
       hosts: ~
       auth: ~
       options: {}
+    -
+      description: loadBalanced=true
+      uri: "mongodb://example.com/?loadBalanced=true"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: true
+    -
+      description: loadBalanced=true with directConnection=false
+      uri: "mongodb://example.com/?loadBalanced=true&directConnection=false"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: true
+          directConnection: false
+    -
+      description: loadBalanced=false
+      uri: "mongodb://example.com/?loadBalanced=false"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: false
+    -
+      description: Invalid loadBalanced value
+      uri: "mongodb://example.com/?loadBalanced=1"
+      valid: true
+      warning: true
+      hosts: ~
+      auth: ~
+      options: {}
+    -
+      description: loadBalanced=true with multiple hosts causes an error
+      uri: "mongodb://example1,example2/?loadBalanced=true"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    -
+      description: loadBalanced=true with directConnection=true causes an error
+      uri: "mongodb://example.com/?loadBalanced=true&directConnection=true"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    -
+      description: loadBalanced=true with replicaSet causes an error
+      uri: "mongodb://example.com/?loadBalanced=true&replicaSet=replset"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}

data/spec/spec_tests/load_balancers_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/load_balancers"
+LOAD_BALANCER_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Load balancer spec tests' do
+  require_topology :load_balanced
+
+  define_unified_spec_tests(base, LOAD_BALANCER_TESTS)
+end

data/spec/spec_tests/retryable_reads_spec.rb

@@ -7,7 +7,7 @@ require 'runners/crud'
 
 describe 'Retryable reads spec tests' do
   require_wired_tiger
-  require_no_multi_shard
+  require_no_multi_mongos
 
   define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
     let(:client) do
@@ -19,7 +19,7 @@ describe 'Retryable reads spec tests' do
 end
 
 describe 'Retryable reads spec tests - legacy' do
-  require_no_multi_shard
+  require_no_multi_mongos
 
   define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
     let(:client_options) do

data/spec/spec_tests/retryable_writes_spec.rb

@@ -7,7 +7,7 @@ require 'runners/crud'
 
 describe 'Retryable writes spec tests' do
   require_wired_tiger
-  require_no_multi_shard
+  require_no_multi_mongos
 
   # Do not run these tests when write retries are disabled globally -
   # the tests won't work in that case and testing them with retries enabled

data/spec/spec_tests/sdam_integration_spec.rb

@@ -9,7 +9,7 @@ require 'runners/transactions'
 SDAM_INTEGRATION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_integration/*.yml").sort
 
 describe 'SDAM integration tests' do
-  require_no_multi_shard
+  require_no_multi_mongos
   require_wired_tiger
 
   define_transactions_spec_tests(SDAM_INTEGRATION_TESTS)

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -16,7 +16,7 @@ describe 'SDAM Monitoring' do
     context("#{spec.description} (#{file.sub(%r'.*/data/sdam_monitoring/', '')})") do
 
       before(:all) do
-        @subscriber = PhasedEventSubscriber.new
+        @subscriber = Mrss::PhasedEventSubscriber.new
         sdam_proc = lambda do |client|
           client.subscribe(Mongo::Monitoring::SERVER_OPENING, @subscriber)
           client.subscribe(Mongo::Monitoring::SERVER_CLOSED, @subscriber)
@@ -39,8 +39,13 @@ describe 'SDAM Monitoring' do
           # 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
+          # false, does not do network I/O or change server status).
+          #
+          # If the server is a load balancer, it doesn't normally get monitored
+          # so don't start here either.
+          unless server.load_balancer?
+            server.start_monitoring
+          end
         end
       end
 
@@ -53,7 +58,7 @@ describe 'SDAM Monitoring' do
         context("Phase: #{phase_index + 1}") do
 
           before(:all) do
-            phase.responses.each do |response|
+            phase.responses&.each do |response|
               # For each response in the phase, we need to change that server's description.
               server = find_server(@client, response.address)
               server ||= @servers_cache[response.address.to_s]
@@ -68,7 +73,7 @@ describe 'SDAM Monitoring' do
               result['minWireVersion'] ||= 0
               result['maxWireVersion'] ||= 0
               new_description = Mongo::Server::Description.new(
-                server.description.address, result, 0.5)
+                server.description.address, result, average_round_trip_time: 0.5)
               @client.cluster.run_sdam_flow(server.description, new_description)
             end
             @subscriber.phase_finished(phase_index)

data/spec/spec_tests/sdam_spec.rb

@@ -98,7 +98,7 @@ describe 'Server Discovery and Monitoring' do
               result['minWireVersion'] ||= 0
               result['maxWireVersion'] ||= 0
               new_description = Mongo::Server::Description.new(
-                server.description.address, result, 0.5)
+                server.description.address, result, average_round_trip_time: 0.5)
               @client.cluster.run_sdam_flow(server.description, new_description)
             end
 

data/spec/spec_tests/seed_list_discovery_spec.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'lite_spec_helper'
+
+require 'support/using_hash'
+require 'runners/connection_string'
+
+SEED_LIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/seed_list_discovery/**/*.yml").sort
+
+describe 'DNS Seedlist Discovery' do
+  require_external_connectivity
+
+  include Mongo::ConnectionString
+
+  SEED_LIST_DISCOVERY_TESTS.each do |test_path|
+
+    spec = YAML.load(File.read(test_path))
+
+    test = Mongo::ConnectionString::Test.new(spec)
+
+    context(File.basename(test_path)) do
+
+      if test.raise_error?
+        context 'the uri is invalid' do
+
+          let(:valid_errors) do
+            [
+              Mongo::Error::InvalidTXTRecord,
+              Mongo::Error::NoSRVRecords,
+              Mongo::Error::InvalidURI,
+              Mongo::Error::MismatchedDomain,
+              # This is unfortunate. RUBY-2624
+              ArgumentError,
+            ]
+          end
+
+          let(:error) do
+            begin
+              test.client
+            rescue => ex
+            end
+            ex
+          end
+
+          it 'raises an error' do
+            expect(valid_errors).to include(error.class)
+          end
+        end
+
+      else
+
+        context 'the uri is valid' do
+
+          it 'does not raise an exception' do
+            expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
+          end
+
+          if test.seeds
+            # DNS seed list tests specify both seeds and hosts.
+            # To get the hosts, the client must do SDAM (as required in the
+            # spec tests' description), but this isn't testing DNS seed list -
+            # it is testing SDAM. Plus, all of the hosts are always the same.
+            # If seed list is given in the expectations, just test the seed
+            # list and not the expanded hosts.
+            it 'creates a client with the correct seeds' do
+              expect(test.client).to have_hosts(test, test.seeds)
+            end
+          else
+            it 'creates a client with the correct hosts' do
+              expect(test.client).to have_hosts(test, test.hosts)
+            end
+          end
+
+          if test.expected_options
+            it 'creates a client with the correct uri options' do
+              mapped = Mongo::URI::OptionsMapper.new.ruby_to_smc(test.client.options)
+              # Connection string spec tests do not use canonical URI option names
+              actual = Utils.downcase_keys(mapped)
+              expected = Utils.downcase_keys(test.expected_options)
+              # SRV tests use ssl URI option instead of tls one
+              if expected.key?('ssl') && !expected.key?('tls')
+                expected['tls'] = expected.delete('ssl')
+              end
+              # The client object contains auth source in options which
+              # isn't asserted in some tests.
+              if actual.key?('authsource') && !expected.key?('authsource')
+                actual.delete('authsource')
+              end
+              actual.should == expected
+            end
+          end
+
+          if test.non_uri_options
+            it 'creates a client with the correct non-uri options' do
+              opts = UsingHash[test.non_uri_options]
+              if user = opts.use('user')
+                test.client.options[:user].should == user
+              end
+              if password = opts.use('password')
+                test.client.options[:password].should == password
+              end
+              if db = opts.use('db')
+                test.client.database.name.should == db
+              end
+              if auth_source = opts.use('auth_database')
+                Mongo::Auth::User.new(test.client.options).auth_source == auth_source
+              end
+              unless opts.empty?
+                raise "Unhandled keys: #{opts}"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_tests/uri_options_spec.rb

@@ -52,8 +52,8 @@ describe 'URI options' do
               expect(test.client).to match_auth(test)
             end
 
-            if test.options
-              if test.options['compressors'] && test.options['compressors'].include?('snappy')
+            if opts = test.expected_options
+              if opts['compressors'] && opts['compressors'].include?('snappy')
                 before do
                   unless ENV.fetch('BUNDLE_GEMFILE', '') =~ /snappy/
                     skip "This test requires snappy compression"
@@ -61,7 +61,7 @@ describe 'URI options' do
                 end
               end
 
-              if test.options['compressors'] && test.options['compressors'].include?('zstd')
+              if opts['compressors'] && opts['compressors'].include?('zstd')
                 before do
                   unless ENV.fetch('BUNDLE_GEMFILE', '') =~ /zstd/
                     skip "This test requires zstd compression"
@@ -72,7 +72,7 @@ describe 'URI options' do
               it 'creates a client with the correct options' do
                 mapped = Mongo::URI::OptionsMapper.new.ruby_to_smc(test.client.options)
                 expected = Mongo::ConnectionString.adjust_expected_mongo_client_options(
-                  test.options,
+                  opts,
                 )
                 mapped.should == expected
               end

data/spec/stress/fork_reconnect_stress_spec.rb

@@ -10,11 +10,7 @@ describe 'fork reconnect' do
   # On multi-shard sharded clusters a succeeding write request does not
   # guarantee that the next operation will succeed (since it could be sent to
   # another shard with a dead connection).
-  require_no_multi_shard
-
-  # On Ruby 2.3 $?.exitstatus is sometimes nil after Process.wait returns which
-  # is not supposed to happen.
-  ruby_version_gte '2.4'
+  require_no_multi_mongos
 
   require_stress
 

data/spec/stress/push_monitor_close_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+# This test repeatedly creates and closes clients across several threads.
+# Its goal is to ensure that the push monitor connections specifically get
+# closed without any errors or warnings being reported to applications.
+#
+# Although the test is specifically meant to test 4.4+ servers (that utilize
+# the push monitor) in non-LB connections, run it everywhere for good measure.
+describe 'Push monitor close test' do
+  require_stress
+
+  let(:options) do
+    SpecConfig.instance.all_test_options
+  end
+
+  before(:all) do
+    # load if necessary
+    ClusterConfig.instance.primary_address
+    ClientRegistry.instance.close_all_clients
+  end
+
+  it 'does not warn/error on cleanup' do
+    Mongo::Logger.logger.should_not receive(:warn)
+
+    threads = 10.times.map do
+      Thread.new do
+        10.times do
+          client = new_local_client([ClusterConfig.instance.primary_address.seed], options)
+          if rand > 0.33
+            client.command(ping: 1)
+            sleep(rand * 3)
+          end
+          client.close
+          STDOUT << '.'
+        end
+      end
+    end
+    threads.each(&:join)
+    puts
+  end
+end