mongo 2.9.2 → 2.10.0.rc0

data/spec/integration/retryable_writes_spec.rb

@@ -13,6 +13,12 @@ require 'spec_helper'
 describe 'Retryable writes integration tests' do
   include PrimarySocket
 
+  require_wired_tiger_on_36
+
+  # These tests override server selector, which fails if there are multiple
+  # eligible servers as would be the case in a multi-shard sharded cluster
+  require_no_multi_shard
+
   before do
     authorized_collection.delete_many
   end
@@ -114,8 +120,8 @@ describe 'Retryable writes integration tests' do
       context 'when the selected server does not support retryable writes' do
 
         before do
-          legacy_primary = double('legacy primary', :'retry_writes?' => false)
-          allow(client.cluster).to receive(:next_primary).and_return(primary_server, legacy_primary)
+          legacy_primary = double('legacy primary', :retry_writes? => false)
+          expect(collection).to receive(:select_server).and_return(primary_server, legacy_primary)
           expect(primary_socket).to receive(:write).and_raise(error)
         end
 
@@ -688,21 +694,4 @@ describe 'Retryable writes integration tests' do
 
     it_behaves_like 'an operation that does not support retryable writes'
   end
-
-  context 'when the operation is database#command' do
-
-    let(:operation) do
-      collection.database.command(ping: 1)
-    end
-
-    let(:expectation) do
-      0
-    end
-
-    let(:unsuccessful_retry_value) do
-      0
-    end
-
-    it_behaves_like 'an operation that does not support retryable writes'
-  end
 end

data/spec/integration/sdam_error_handling_spec.rb

@@ -7,7 +7,7 @@ describe 'SDAM error handling' do
 
   # These tests operate on specific servers, and don't work in a multi
   # shard cluster where multiple servers are equally eligible
-  require_topology :replica_set
+  require_no_multi_shard
 
   let(:client) { authorized_client_without_any_retries }
 

data/spec/integration/sdam_events_spec.rb

@@ -17,7 +17,7 @@ describe 'SDAM events' do
       client.database.command(ismaster: 1)
       expect(subscriber.events).to be_empty
 
-      client.close
+      client.close(true)
 
       expect(subscriber.events).not_to be_empty
       event = subscriber.first_event('server_closed_event')
@@ -35,7 +35,7 @@ describe 'SDAM events' do
       client.database.command(ismaster: 1)
       expect(subscriber.events).to be_empty
 
-      client.close
+      client.close(true)
 
       expect(subscriber.events).not_to be_empty
       event = subscriber.first_event('topology_closed_event')

data/spec/integration/server_description_spec.rb

@@ -1,15 +1,21 @@
 require 'spec_helper'
 
 describe 'Server description' do
+  clean_slate
+
+  let(:client) { ClientRegistry.instance.global_client('authorized') }
+  let(:desc) do
+    client.cluster.next_primary.description
+  end
+
+  let!(:start_time) { Time.now }
+
   describe '#op_time' do
     require_topology :replica_set
     min_server_fcv '3.4'
 
-    let(:client) { ClientRegistry.instance.global_client('authorized') }
-    let(:desc) { client.cluster.servers.first.description }
-
     it 'is set' do
-      client.database.command(ismaster: 1)
+      expect(desc).not_to be_unknown
 
       expect(desc.op_time).to be_a(BSON::Timestamp)
     end
@@ -19,30 +25,21 @@ describe 'Server description' do
     require_topology :replica_set
     min_server_fcv '3.4'
 
-    let(:client) { ClientRegistry.instance.global_client('authorized') }
-    let(:desc) { client.cluster.servers.first.description }
-
     it 'is set' do
-      client.database.command(ismaster: 1)
+      expect(desc).not_to be_unknown
 
       expect(desc.last_write_date).to be_a(Time)
     end
   end
 
   describe '#last_update_time' do
-    before do
-      ClientRegistry.instance.close_all_clients
-    end
-
-    let(:client) { ClientRegistry.instance.global_client('authorized') }
-    let(:desc) { client.cluster.next_primary.description }
 
     it 'is set' do
-      client.database.command(ismaster: 1)
+      expect(desc).not_to be_unknown
 
       expect(desc.last_update_time).to be_a(Time)
-      # checked in the last 3 seconds
-      expect(Time.now - desc.last_update_time < 3).to be true
+      # checked while this test was running
+      expect(desc.last_update_time).to be > start_time
     end
   end
 end

data/spec/integration/server_selector_spec.rb

@@ -6,6 +6,10 @@ describe 'Server selector' do
   let(:cluster) { client.cluster }
 
   describe '#select_server' do
+    # These tests operate on specific servers, and don't work in a multi
+    # shard cluster where multiple servers are equally eligible
+    require_no_multi_shard
+
     let(:result) { selector.select_server(cluster) }
 
     it 'selects' do
@@ -13,7 +17,7 @@ describe 'Server selector' do
     end
 
     context 'no servers in the cluster' do
-      let(:client) { Mongo::Client.new([], server_selection_timeout: 2) }
+      let(:client) { new_local_client_nmio([], server_selection_timeout: 2) }
 
       it 'raises NoServerAvailable with a message explaining the situation' do
         expect do
@@ -35,7 +39,7 @@ describe 'Server selector' do
       context 'there is a known primary' do
         before do
           client.cluster.next_primary
-          client.close
+          client.close(true)
           expect(client.cluster.connected?).to be false
         end
 
@@ -47,7 +51,7 @@ describe 'Server selector' do
       context 'there is no known primary' do
         before do
           primary_server = client.cluster.next_primary
-          client.close
+          client.close(true)
           expect(client.cluster.connected?).to be false
           primary_server.unknown!
         end

data/spec/integration/server_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Server' do
+  let(:client) { authorized_client }
+
+  let(:server) { client.cluster.next_primary }
+
+  let(:collection) { client['collection'] }
+  let(:view) { Mongo::Collection::View.new(collection) }
+
+  describe 'operations when client/cluster are disconnected' do
+    # Server versions lower than 3.4 use the legacy find result
+    min_server_fcv '3.4'
+
+    context 'normal server' do
+      it 'can be used for reads' do
+        result = view.send(:send_initial_query, server)
+        expect(result).to be_a(Mongo::Operation::Find::Result)
+      end
+    end
+
+    context 'known server in disconnected cluster' do
+      before do
+        client.close
+        expect(server).not_to be_unknown
+      end
+
+      it 'can be used for reads' do
+        result = view.send(:send_initial_query, server)
+        expect(result).to be_a(Mongo::Operation::Find::Result)
+      end
+    end
+
+    context 'unknown server in disconnected cluster' do
+      before do
+        client.close
+        server.unknown!
+        expect(server).to be_unknown
+      end
+
+      it 'can be used for reads' do
+        result = view.send(:send_initial_query, server)
+        # Driver falls back to the oldest MongoDB protocol
+        expect(result).to be_a(Mongo::Operation::Find::Legacy::Result)
+      end
+    end
+  end
+end

data/spec/integration/ssl_uri_options_spec.rb

@@ -19,7 +19,7 @@ describe 'SSL connections with URI options' do
   end
 
   it 'successfully connects and runs an operation' do
-    client = Mongo::Client.new(uri)
+    client = new_local_client(uri)
     expect { client[:foo].count_documents({}) }.not_to raise_error
   end
 end

data/spec/integration/step_down_spec.rb

@@ -3,12 +3,19 @@ require 'spec_helper'
 describe 'Step down behavior' do
   require_topology :replica_set
 
-=begin Uncommenting this will reduce the runtime of the test, but the spec currently does not allow us to do it
+  # This setup reduces the runtime of the test and makes execution more
+  # reliable. The spec as written requests a simple brute force step down,
+  # but this causes intermittent failures.
   before(:all) do
     # These before/after blocks are run even if the tests themselves are
     # skipped due to server version not being appropriate
     if ClusterConfig.instance.fcv_ish >= '4.2' && ClusterConfig.instance.topology == :replica_set
-      ClusterTools.instance.set_election_timeout(1)
+      # It seems that a short election timeout can cause unintended elections,
+      # which makes the server close connections which causes the driver to
+      # reconnect which then fails the step down test.
+      # The election timeout here is greater than the catch up period and
+      # step down timeout specified in cluster tools.
+      ClusterTools.instance.set_election_timeout(5)
       ClusterTools.instance.set_election_handoff(false)
     end
   end
@@ -20,7 +27,6 @@ describe 'Step down behavior' do
       ClusterTools.instance.reset_priorities
     end
   end
-=end
 
   let(:event_subscriber) { EventSubscriber.new }
 
@@ -70,7 +76,7 @@ describe 'Step down behavior' do
       expect(connection_created_events).not_to be_empty
 
       current_primary = subscribed_client.cluster.next_primary
-      ClusterTools.instance.force_step_down
+      ClusterTools.instance.change_primary
 
       EventSubscriber.clear_events!
 

data/spec/integration/transactions_examples_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe 'Transactions examples' do
+  require_wired_tiger
   require_transaction_support
 
   let(:hr) do
@@ -44,8 +45,8 @@ describe 'Transactions examples' do
         session.commit_transaction
         puts 'Transaction committed.'
       rescue Mongo::Error => e
-        if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-          puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
+        if e.label?('UnknownTransactionCommitResult')
+          puts "UnknownTransactionCommitResult, retrying commit operation..."
           retry
         else
           puts 'Error during commit ...'
@@ -80,9 +81,9 @@ describe 'Transactions examples' do
         rescue Mongo::Error => e
 
           puts 'Transaction aborted. Caught exception during transaction.'
-          raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
+          raise unless e.label?('TransientTransactionError')
 
-          puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
+          puts "TransientTransactionError, retrying transaction ..."
           retry
         end
       end
@@ -110,8 +111,8 @@ describe 'Transactions examples' do
           session.commit_transaction
           puts 'Transaction committed.'
         rescue Mongo::Error=> e
-          if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-            puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
+          if e.label?('UnknownTransactionCommitResult')
+            puts "UnknownTransactionCommitResult, retrying commit operation..."
             retry
           else
             puts 'Error during commit ...'
@@ -154,8 +155,8 @@ describe 'Transactions examples' do
           yield session # performs transaction
         rescue Mongo::Error => e
           puts 'Transaction aborted. Caught exception during transaction.'
-          raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
-          puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
+          raise unless e.label?('TransientTransactionError')
+          puts "TransientTransactionError, retrying transaction ..."
           retry
         end
       end
@@ -165,8 +166,8 @@ describe 'Transactions examples' do
           session.commit_transaction
           puts 'Transaction committed.'
         rescue Mongo::Error => e
-          if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-            puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation ..."
+          if e.label?('UnknownTransactionCommitResult')
+            puts "UnknownTransactionCommitResult, retrying commit operation ..."
             retry
           else
             puts 'Error during commit ...'

data/spec/lite_spec_helper.rb

@@ -1,24 +1,27 @@
 COVERAGE_MIN = 90
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
-SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam/**/*.yml")
-SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_monitoring/*.yml")
-SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.yml")
-SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection/**/*.yml")
-MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/max_staleness/**/*.yml")
-CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud/**/*.yml")
-RETRYABLE_WRITES_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_writes/**/*.yml")
+
+SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam/**/*.yml").sort
+SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_monitoring/*.yml").sort
+SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.yml").sort
+SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection/**/*.yml").sort
+MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/max_staleness/**/*.yml").sort
+CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud/**/*.yml").sort
+CRUD2_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud_v2/**/*.yml").sort
+RETRYABLE_WRITES_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_writes/**/*.yml").sort
 RETRYABLE_READS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_reads/**/*.yml").sort
-COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml")
-CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml")
-URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml")
-DNS_SEEDLIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/dns_seedlist_discovery/*.yml")
-GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml")
-TRANSACTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions/*.yml")
-TRANSACTIONS_API_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions_api/*.yml")
-CHANGE_STREAMS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/change_streams/*.yml")
-CMAP_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/cmap/*.yml")
+COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml").sort
+CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml").sort
+URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml").sort
+DNS_SEEDLIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/dns_seedlist_discovery/*.yml").sort
+GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml").sort
+TRANSACTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions/*.yml").sort
+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
 
 require 'mongo'
+require 'pp'
 
 unless ENV['CI']
   begin

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

@@ -1,11 +1,14 @@
 require 'spec_helper'
 
+# This test should set cleanup: false on all clients, because due to
+# https://jira.mongodb.org/browse/RUBY-1772 we may be getting connections
+# established after the client is closed which screws up our assertions on
+# the auth calls. When 1772 is fixed, the cleanup should happen on existing
+# connections and thus should no longer interfere with auth assertions.
+
 describe 'SCRAM-SHA auth mechanism negotiation' do
   min_server_fcv '4.0'
-
-  before(:all) do
-    ClientRegistry.instance.close_all_clients
-  end
+  clean_slate
 
   URI_OPTION_MAP = {
     :auth_source => 'authsource',
@@ -13,7 +16,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
   }
 
   let(:create_user!) do
-    ClientRegistry.instance.global_client('root_authorized_admin').tap do |client|
+    root_authorized_admin_client.tap do |client|
       users = client.database.users
       if users.info(user.name).any?
         users.remove(user.name)
@@ -24,7 +27,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
         roles: ['root'],
         mechanisms: server_user_auth_mechanisms,
       )
-      client.close
+      client.close(true)
     end
   end
 
@@ -49,7 +52,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
 
       new_local_client(
         SpecConfig.instance.addresses,
-        SpecConfig.instance.test_options.merge(opts)
+        SpecConfig.instance.test_options.merge(opts).update(cleanup: false)
       )
     end
 
@@ -332,7 +335,7 @@ describe 'SCRAM-SHA auth mechanism negotiation' do
     end
 
     let(:client) do
-      new_local_client(uri, SpecConfig.instance.ssl_options)
+      new_local_client(uri, SpecConfig.instance.ssl_options.merge(cleanup: false))
     end
 
     context 'when the user exists' do

data/spec/mongo/bulk_write/ordered_combiner_spec.rb

@@ -150,8 +150,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 replace_one: [
-                  { 'q' => { _id: 0 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false },
-                  { 'q' => { _id: 1 }, 'u' => { name: 'test' }, 'multi' => false, 'upsert' => false }
+                  { 'q' => { _id: 0 }, 'u' => { name: 'test' }, },
+                  { 'q' => { _id: 1 }, 'u' => { name: 'test' }, },
                 ]
               }
             ]
@@ -192,8 +192,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 update_one: [
-                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false },
-                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => false, 'upsert' => false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, },
                 ]
               }
             ]
@@ -234,8 +234,8 @@ describe Mongo::BulkWrite::OrderedCombiner do
             [
               {
                 update_many: [
-                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false },
-                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, 'upsert' => false }
+                  { 'q' => { _id: 0 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, },
+                  { 'q' => { _id: 1 }, 'u' => { '$set' => { name: 'test' }}, 'multi' => true, },
                 ]
               }
             ]