mongo 2.10.5 → 2.11.0.rc0

data/spec/integration/step_down_spec.rb

@@ -9,6 +9,7 @@ describe 'Step down behavior' do
   before(:all) do
     # These before/after blocks are run even if the tests themselves are
     # skipped due to server version not being appropriate
+    ClientRegistry.instance.close_all_clients
     if ClusterConfig.instance.fcv_ish >= '4.2' && ClusterConfig.instance.topology == :replica_set
       # It seems that a short election timeout can cause unintended elections,
       # which makes the server close connections which causes the driver to
@@ -160,8 +161,7 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
-        # Temporarily add 1 due to RUBY-1894 backport
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(0+1)
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(0)
       end
     end
 
@@ -180,8 +180,7 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
-        # Temporarily add 1 due to RUBY-1894 backport
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1+1)
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
       end
     end
 
@@ -198,8 +197,7 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /11600/)
 
-        # Temporarily add 1 due to RUBY-1894 backport
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1+1)
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
       end
     end
   end

data/spec/lite_spec_helper.rb

@@ -19,10 +19,13 @@ TRANSACTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions/*.ym
 TRANSACTIONS_API_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions_api/*.yml").sort
 CHANGE_STREAMS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/change_streams/*.yml").sort
 CMAP_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/cmap/*.yml").sort
+AUTH_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/auth/*.yml").sort
 
 require 'mongo'
 require 'pp'
 
+autoload :Benchmark, 'benchmark'
+
 unless ENV['CI']
   begin
     require 'byebug'
@@ -37,6 +40,13 @@ unless ENV['CI']
   end
 end
 
+if BSON::Environment.jruby?
+  require 'concurrent-ruby'
+  PossiblyConcurrentArray = Concurrent::Array
+else
+  PossiblyConcurrentArray = Array
+end
+
 require 'support/spec_config'
 
 Mongo::Logger.logger = Logger.new($stdout)
@@ -68,6 +78,8 @@ 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'
 
 if SpecConfig.instance.mri?
   require 'timeout_interrupt'
@@ -106,6 +118,16 @@ RSpec.configure do |config|
       end
     end
   end
+
+  if SpecConfig.instance.ci?
+    unless BSON::Environment.jruby?
+      Rfc::Rif.output_object_space_stats = true
+    end
+  end
+
+  config.expect_with :rspec do |c|
+    c.max_formatted_output_length = 10000
+  end
 end
 
 EventSubscriber.initialize

data/spec/mongo/address/validator_spec.rb

@@ -0,0 +1,51 @@
+require 'lite_spec_helper'
+
+class ValidatorHost
+  include Mongo::Address::Validator
+end
+
+describe Mongo::Address::Validator do
+  let(:host) { ValidatorHost.new }
+
+  describe '#validate_address_str!' do
+    shared_examples_for 'raises InvalidAddress' do
+      it 'raises InvalidAddress' do
+        expect do
+          host.validate_address_str!(address_str)
+        end.to raise_error(Mongo::Error::InvalidAddress)
+      end
+    end
+
+    shared_examples_for 'passes validation' do
+      it 'passes validation' do
+        expect do
+          host.validate_address_str!(address_str)
+        end.not_to raise_error
+      end
+    end
+
+    context 'leading dots' do
+      let(:address_str) { '.foo.bar.com' }
+
+      it_behaves_like 'raises InvalidAddress'
+    end
+
+    context 'trailing dots' do
+      let(:address_str) { 'foo.bar.com.' }
+
+      it_behaves_like 'raises InvalidAddress'
+    end
+
+    context 'runs of multiple dots' do
+      let(:address_str) { 'foo..bar.com' }
+
+      it_behaves_like 'raises InvalidAddress'
+    end
+
+    context 'no dots' do
+      let(:address_str) { 'foo' }
+
+      it_behaves_like 'passes validation'
+    end
+  end
+end

data/spec/mongo/auth/cr_spec.rb

@@ -2,36 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Auth::CR do
 
-  let(:address) do
-    default_address
-  end
-
-  let(:monitoring) do
-    Mongo::Monitoring.new(monitoring: false)
-  end
-
-  let(:listeners) do
-    Mongo::Event::Listeners.new
-  end
-
-  let(:cluster) do
-    double('cluster').tap do |cl|
-      allow(cl).to receive(:topology).and_return(topology)
-      allow(cl).to receive(:app_metadata).and_return(app_metadata)
-      allow(cl).to receive(:options).and_return({})
-      allow(cl).to receive(:cluster_time).and_return(nil)
-      allow(cl).to receive(:update_cluster_time)
-    end
-  end
-
-  declare_topology_double
-
   let(:server) do
-    Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options
-    ).tap do |server|
-      server.scan!
-    end
+    authorized_client.cluster.next_primary
   end
 
   let(:connection) do

data/spec/mongo/auth/ldap_spec.rb

@@ -2,36 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Auth::LDAP do
 
-  let(:address) do
-    default_address
-  end
-
-  let(:monitoring) do
-    Mongo::Monitoring.new(monitoring: false)
-  end
-
-  let(:listeners) do
-    Mongo::Event::Listeners.new
-  end
-
-  let(:cluster) do
-    double('cluster').tap do |cl|
-      allow(cl).to receive(:topology).and_return(topology)
-      allow(cl).to receive(:app_metadata).and_return(app_metadata)
-      allow(cl).to receive(:options).and_return({})
-      allow(cl).to receive(:cluster_time).and_return(nil)
-      allow(cl).to receive(:update_cluster_time)
-    end
-  end
-
-  declare_topology_double
-
   let(:server) do
-    Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options
-    ).tap do |server|
-      server.scan!
-    end
+    authorized_client.cluster.next_primary
   end
 
   let(:connection) do

data/spec/mongo/auth/scram/conversation_spec.rb

@@ -57,7 +57,6 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     end
 
     describe '#continue' do
-      fails_on_jruby
 
       let(:reply) do
         Mongo::Protocol::Message.new
@@ -125,7 +124,6 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     end
 
     describe '#finalize' do
-      fails_on_jruby
 
       let(:continue_reply) do
         Mongo::Protocol::Message.new

data/spec/mongo/auth/scram/negotiation_spec.rb

@@ -27,7 +27,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
         roles: ['root'],
         mechanisms: server_user_auth_mechanisms,
       )
-      client.close(true)
+      client.close
     end
   end
 

data/spec/mongo/auth/scram_spec.rb

@@ -2,36 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Auth::SCRAM do
 
-  let(:address) do
-    default_address
-  end
-
-  let(:monitoring) do
-    Mongo::Monitoring.new(monitoring: false)
-  end
-
-  let(:listeners) do
-    Mongo::Event::Listeners.new
-  end
-
-  let(:cluster) do
-    double('cluster').tap do |cl|
-      allow(cl).to receive(:topology).and_return(topology)
-      allow(cl).to receive(:app_metadata).and_return(app_metadata)
-      allow(cl).to receive(:options).and_return({})
-      allow(cl).to receive(:cluster_time).and_return(nil)
-      allow(cl).to receive(:update_cluster_time)
-    end
-  end
-
-  declare_topology_double
-
   let(:server) do
-    Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options
-    ).tap do |server|
-      server.scan!
-    end
+    authorized_client.cluster.next_primary
   end
 
   let(:connection) do

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

@@ -2,10 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Auth::User::View do
 
-  let(:database) { root_authorized_client.database }
-
   let(:view) do
-    described_class.new(database)
+    described_class.new(root_authorized_client.database)
   end
 
   before do
@@ -14,39 +12,6 @@ describe Mongo::Auth::User::View do
 
   describe '#create' do
 
-    context 'when password is not provided' do
-
-      let(:database) { root_authorized_client.use('$external').database }
-
-      let(:username) { 'passwordless-user' }
-
-      let(:response) do
-        view.create(
-          username,
-          # https://stackoverflow.com/questions/55939832/mongodb-external-database-cannot-create-new-user-with-user-defined-role
-          roles: [{role: 'read', db: 'admin'}],
-        )
-      end
-
-      before do
-        begin
-          view.remove(username)
-        rescue Mongo::Error::OperationFailure
-          # can be user not found, ignore
-        end
-      end
-
-      it 'creates the user' do
-        view.info(username).should == []
-
-        lambda do
-          response
-        end.should_not raise_error
-
-        view.info(username).first['user'].should == username
-      end
-    end
-
     context 'when a session is not used' do
 
       let!(:response) do

data/spec/mongo/auth/user_spec.rb

@@ -284,16 +284,4 @@ describe Mongo::Auth::User do
       end
     end
   end
-
-  describe '#spec' do
-    context 'when no password and no roles are set' do
-      let(:user) do
-        described_class.new(user: 'foo')
-      end
-
-      it 'is a hash with empty roles' do
-        user.spec.should == {roles: []}
-      end
-    end
-  end
 end

data/spec/mongo/auth/x509_spec.rb

@@ -2,36 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Auth::X509 do
 
-  let(:address) do
-    default_address
-  end
-
-  let(:monitoring) do
-    Mongo::Monitoring.new(monitoring: false)
-  end
-
-  let(:listeners) do
-    Mongo::Event::Listeners.new
-  end
-
-  let(:cluster) do
-    double('cluster').tap do |cl|
-      allow(cl).to receive(:topology).and_return(topology)
-      allow(cl).to receive(:app_metadata).and_return(app_metadata)
-      allow(cl).to receive(:options).and_return({})
-      allow(cl).to receive(:cluster_time).and_return(nil)
-      allow(cl).to receive(:update_cluster_time)
-    end
-  end
-
-  declare_topology_double
-
   let(:server) do
-    Mongo::Server.new(address, cluster, monitoring, listeners,
-      SpecConfig.instance.test_options
-    ).tap do |server|
-      server.scan!
-    end
+    authorized_client.cluster.next_primary
   end
 
   let(:connection) do

data/spec/mongo/bulk_write_spec.rb

@@ -1924,11 +1924,11 @@ describe Mongo::BulkWrite do
             end
 
             let(:first_txn_number) do
-              Utils.int64_value(started_events[-2].command['txnNumber'])
+              started_events[-2].command['txnNumber'].instance_variable_get(:@integer)
             end
 
             let(:second_txn_number) do
-              Utils.int64_value(started_events[-1].command['txnNumber'])
+              started_events[-1].command['txnNumber'].instance_variable_get(:@integer)
             end
 
             it 'inserts the documents' do

data/spec/mongo/client_construction_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Client do
-  before do
-    ClientRegistry.instance.close_all_clients
-  end
+  clean_slate
 
   describe '.new' do
     describe 'options' do
@@ -87,10 +85,9 @@ describe Mongo::Client do
         # https://github.com/rspec/rspec-mocks/issues/1242.
         #expect_any_instance_of(Mongo::Server::Monitor).to receive(:scan!).
         #  exactly(SpecConfig.instance.addresses.length).times.and_call_original
-        c = ClientRegistry.instance.new_local_client(
+        c = new_local_client(
           SpecConfig.instance.addresses, SpecConfig.instance.test_options)
         expect(c.cluster.servers).not_to be_empty
-        c.close
       end
 
       # This checks the case of all initial seeds being removed from
@@ -120,19 +117,57 @@ describe Mongo::Client do
           end
         end
 
+        let(:logger) do
+          Logger.new(STDOUT, level: Logger::DEBUG)
+        end
+
+        let(:subscriber) do
+          Mongo::Monitoring::UnifiedSdamLogSubscriber.new(
+            logger: logger,
+            log_prefix: 'CCS-SDAM',
+          )
+        end
+
         let(:client) do
           ClientRegistry.instance.new_local_client(
             [address],
             # Specify server selection timeout here because test suite sets
             # one by default and it's fairly low
-            SpecConfig.instance.test_options.merge(server_selection_timeout: 5))
+            SpecConfig.instance.test_options.merge(
+              connect_timeout: 1,
+              socket_timeout: 1,
+              server_selection_timeout: 8,
+              logger: logger,
+              log_prefix: 'CCS-CLIENT',
+              sdam_proc: lambda do |client|
+                subscriber.subscribe(client)
+              end
+            ))
         end
 
         it 'does not wait for server selection timeout' do
-          start_time = Time.now
-          client
-          time_taken = Time.now - start_time
-          expect(time_taken < 3).to be true
+          time_taken = Benchmark.realtime do
+            # Client is created here.
+            client
+          end
+          puts "client_construction_spec.rb: Cluster is: #{client.cluster.summary}"
+
+          # Because the first round of sdam waits for server statuses to change
+          # rather than for server selection semaphore on the cluster which
+          # is signaled after topology is updated, the topology here could be
+          # old (i.e. a monitor thread was just about to update the topology
+          # but hasn't quite gotten to it. Add a small delay to compensate.
+          # This issue doesn't apply to real applications which will wait for
+          # server selection semaphore.
+          sleep 0.1
+
+          actual_class = client.cluster.topology.class
+          expect([
+            Mongo::Cluster::Topology::ReplicaSetWithPrimary,
+            Mongo::Cluster::Topology::Single,
+            Mongo::Cluster::Topology::Sharded,
+          ]).to include(actual_class)
+          expect(time_taken).to be < 5
 
           # run a command to ensure the client is a working one
           client.database.command(ismaster: 1)
@@ -197,7 +232,8 @@ describe Mongo::Client do
       context 'when compressors are provided' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, authorized_client.options.merge(options))
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.all_test_options.merge(options))
         end
 
         context 'when the compressor is supported' do
@@ -1323,7 +1359,10 @@ describe Mongo::Client do
 
     context 'when new client has a new cluster' do
       let(:client) do
-        new_local_client(['127.0.0.1:27017'], :database => SpecConfig.instance.test_db)
+        new_local_client(['127.0.0.1:27017'],
+          database: SpecConfig.instance.test_db,
+          server_selection_timeout: 0.5,
+          socket_timeout: 0.1, connect_timeout: 0.1)
       end
       let(:new_client) do
         client.with(app_name: 'client_construction_spec').tap do |new_client|
@@ -1359,12 +1398,14 @@ describe Mongo::Client do
       let(:new_client) { client.with(database: 'foo') }
 
       it 'does not copy sdam_proc option to new client' do
-        client = new_local_client(['a'], sdam_proc: sdam_proc)
+        client = new_local_client_nmio(['a'], sdam_proc: sdam_proc)
         expect(new_client.options[:sdam_proc]).to be nil
       end
 
       it 'does not notify subscribers set up by sdam_proc' do
-        client = new_local_client(['a'], sdam_proc: sdam_proc)
+        client = new_local_client(['a'], sdam_proc: sdam_proc,
+          connect_timeout: 0.1, socket_timeout: 0.1,
+          server_selection_timeout: 0.1)
         expect(subscriber.started_events.length).to be > 0
         subscriber.started_events.clear
 
@@ -1380,7 +1421,7 @@ describe Mongo::Client do
   describe '#dup' do
 
     let(:client) do
-      new_local_client(
+      new_local_client_nmio(
           ['127.0.0.1:27017'],
           :read => { :mode => :primary },
           :database => SpecConfig.instance.test_db