mongo 2.17.1 → 2.18.1

data/spec/integration/snapshot_query_examples_spec.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Snapshot Query Examples' do
+  require_topology :replica_set, :sharded
+  require_no_auth
+  require_no_tls
+
+  min_server_fcv '5.0'
+
+  let(:uri_string) do
+    "mongodb://#{SpecConfig.instance.addresses.join(',')}/?w=majority"
+  end
+
+  context "Snapshot Query Example 1" do
+    before do
+      client = authorized_client.use('pets')
+      client['cats'].delete_many
+      client['dogs'].delete_many
+
+      client['cats'].insert_one(
+        name: "Whiskers",
+        color: "white",
+        age: 10,
+        adoptable: true
+      )
+
+      client['dogs'].insert_one(
+        name: "Pebbles",
+        color: "Brown",
+        age: 10,
+        adoptable: true
+      )
+      if ClusterConfig.instance.topology == :sharded
+        run_mongos_distincts "pets", "cats"
+      else
+        wait_for_snapshot(db: 'pets', collection: 'cats')
+        wait_for_snapshot(db: 'pets', collection: 'dogs')
+      end
+    end
+
+    it "returns a snapshot of the data" do
+
+      adoptable_pets_count = 0
+
+      # Start Snapshot Query Example 1
+
+      client = Mongo::Client.new(uri_string, database: "pets")
+
+      client.start_session(snapshot: true) do |session|
+        adoptable_pets_count = client['cats'].aggregate([
+          { "$match": { "adoptable": true } },
+          { "$count": "adoptable_cats_count" }
+        ], session: session).first["adoptable_cats_count"]
+
+        adoptable_pets_count += client['dogs'].aggregate([
+          { "$match": { "adoptable": true } },
+          { "$count": "adoptable_dogs_count" }
+        ], session: session).first["adoptable_dogs_count"]
+
+        puts adoptable_pets_count
+      end
+
+      # End Snapshot Query Example 1
+
+      expect(adoptable_pets_count).to eq 2
+      client.close
+    end
+  end
+
+  context "Snapshot Query Example 2" do
+    before do
+      client = authorized_client.use('retail')
+      client['sales'].delete_many
+
+      client['sales'].insert_one(
+        shoeType: "boot",
+        price: 30,
+        saleDate: Time.now
+      )
+
+      if ClusterConfig.instance.topology == :sharded
+        run_mongos_distincts "retail", "sales"
+      else
+        wait_for_snapshot(db: 'retail', collection: 'sales')
+      end
+    end
+
+    it "returns a snapshot of the data" do
+
+      total = 0
+
+      # Start Snapshot Query Example 2
+
+      client = Mongo::Client.new(uri_string, database: "retail")
+
+      client.start_session(snapshot: true) do |session|
+        total = client['sales'].aggregate([
+          {
+             "$match": {
+                "$expr": {
+                   "$gt": [
+                      "$saleDate",
+                      {
+                         "$dateSubtract": {
+                            startDate: "$$NOW",
+                            unit: "day",
+                            amount: 1
+                         }
+                      }
+                   ]
+                 }
+              }
+          },
+          { "$count": "total_daily_sales" }
+        ], session: session).first["total_daily_sales"]
+      end
+
+      # End Snapshot Query Example 2
+
+      expect(total).to eq 1
+      client.close
+    end
+  end
+end

data/spec/integration/srv_monitoring_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 
 describe 'SRV Monitoring' do
   clean_slate_for_all
+  require_external_connectivity
 
   context 'with SRV lookups mocked at Resolver' do
     let(:srv_result) do
@@ -402,5 +403,42 @@ describe 'SRV Monitoring' do
         end
       end
     end
+
+    context 'when the client mocks the srvServiceName' do
+
+      let(:uri) do
+        "mongodb+srv://test-fake.test.build.10gen.cc/?tls=#{SpecConfig.instance.ssl?}&tlsInsecure=true&srvServiceName=customname"
+      end
+
+      it 'finds the records using the custom service name' do
+
+        rules = [
+          ['_customname._tcp.test-fake.test.build.10gen.cc', :srv,
+            [0, 0, 27998, 'localhost.test.build.10gen.cc'],
+            [0, 0, 27999, 'localhost.test.build.10gen.cc'],
+          ],
+        ]
+
+        mock_dns(rules) do
+          15.times do
+            address_strs = client.cluster.servers_list.map(&:address).map(&:seed).sort
+            if address_strs == %w(
+                localhost.test.build.10gen.cc:27998
+                localhost.test.build.10gen.cc:27999
+              )
+            then
+              break
+            end
+            sleep 1
+          end
+
+          address_strs = client.cluster.servers_list.map(&:address).map(&:seed).sort
+          expect(address_strs).to eq(%w(
+            localhost.test.build.10gen.cc:27998
+            localhost.test.build.10gen.cc:27999
+          ))
+        end
+      end
+    end
   end
 end

data/spec/integration/srv_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 
 describe 'SRV lookup' do
   context 'end to end' do
+    require_external_connectivity
 
     # JRuby apparently does not implement non-blocking UDP I/O which is used
     # by RubyDNS:

data/spec/integration/step_down_spec.rb

@@ -134,10 +134,14 @@ describe 'Step down behavior' do
     end
 
     let(:fail_point) do
-      { configureFailPoint: 'failCommand', data: {
-        # There is currently no way to turn write retries on not master
-        # errors off - therefore set the number of fails to 2
-        failCommands: ['insert'], errorCode: fail_point_code, }, mode: {times: 2} }
+      {
+        configureFailPoint: 'failCommand',
+        data: {
+          failCommands: ['insert'],
+          errorCode: fail_point_code,
+        },
+        mode: { times: 1 }
+      }
     end
 
     before do
@@ -165,6 +169,10 @@ describe 'Step down behavior' do
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
         expect(subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(0)
+
+        expect do
+          collection.insert_one(test: 1)
+        end.to_not raise_error
       end
     end
 
@@ -184,6 +192,10 @@ describe 'Step down behavior' do
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
         expect(subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
+
+        expect do
+          collection.insert_one(test: 1)
+        end.to_not raise_error
       end
     end
 
@@ -201,6 +213,10 @@ describe 'Step down behavior' do
         end.to raise_error(Mongo::Error::OperationFailure, /11600/)
 
         expect(subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
+
+        expect do
+          collection.insert_one(test: 1)
+        end.to_not raise_error
       end
     end
   end

data/spec/integration/transaction_pinning_spec.rb

@@ -76,7 +76,7 @@ describe 'Transaction pinning' do
         session.start_transaction
         client["tx_pin"].insert_one({test: 1}, session: session)
         session.pinned_server.should be nil
-        session.pinned_service_id.should_not be nil
+        session.pinned_connection_global_id.should_not be nil
 
         server.pool.size.should == 1
         server.pool.clear
@@ -99,7 +99,7 @@ describe 'Transaction pinning' do
           session.start_transaction
           client["tx_pin_t#{i}"].insert_one({test: 1}, session: session)
           session.pinned_server.should be nil
-          session.pinned_service_id.should_not be nil
+          session.pinned_connection_global_id.should_not be nil
           sessions << session
           connections << server.pool.check_out
         end

data/spec/integration/versioned_api_examples_spec.rb

@@ -9,9 +9,10 @@ describe 'Versioned API examples' do
   # the tests to simple configurations
   require_no_auth
   require_no_tls
+  min_server_version("5.0")
 
   let(:uri_string) do
-    "mongodb://#{SpecConfig.instance.addresses.join(',')}"
+    "mongodb://#{SpecConfig.instance.addresses.join(',')}/versioned-api-examples"
   end
 
   it 'Versioned API example 1' do
@@ -67,48 +68,53 @@ describe 'Versioned API examples' do
     client.close
   end
 
-  it "Versioned API Strict Migration Example" do
-    client = Mongo::Client.new(uri_string, server_api: {version: "1", strict: true})
-    client[:sales].drop
+  # See also RUBY-2922 for count in versioned api v1.
+  context 'servers that exclude count from versioned api' do
+    max_server_version '5.0.8'
 
-    # Start Versioned API Example 5
+    it "Versioned API Strict Migration Example" do
+      client = Mongo::Client.new(uri_string, server_api: {version: "1", strict: true})
+      client[:sales].drop
 
-    client[:sales].insert_many([
-      { _id: 1, item: "abc", price: 10, quantity: 2,  date: DateTime.parse("2021-01-01T08:00:00Z") },
-      { _id: 2, item: "jkl", price: 20, quantity: 1,  date: DateTime.parse("2021-02-03T09:00:00Z") },
-      { _id: 3, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-03T09:05:00Z") },
-      { _id: 4, item: "abc", price: 10, quantity: 10, date: DateTime.parse("2021-02-15T08:00:00Z") },
-      { _id: 5, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T09:05:00Z") },
-      { _id: 6, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-15T12:05:10Z") },
-      { _id: 7, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T14:12:12Z") },
-      { _id: 8, item: "abc", price: 10, quantity: 5,  date: DateTime.parse("2021-03-16T20:20:13Z") }
-    ])
+      # Start Versioned API Example 5
 
-    # End Versioned API Example 5
+      client[:sales].insert_many([
+        { _id: 1, item: "abc", price: 10, quantity: 2,  date: DateTime.parse("2021-01-01T08:00:00Z") },
+        { _id: 2, item: "jkl", price: 20, quantity: 1,  date: DateTime.parse("2021-02-03T09:00:00Z") },
+        { _id: 3, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-03T09:05:00Z") },
+        { _id: 4, item: "abc", price: 10, quantity: 10, date: DateTime.parse("2021-02-15T08:00:00Z") },
+        { _id: 5, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T09:05:00Z") },
+        { _id: 6, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-15T12:05:10Z") },
+        { _id: 7, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T14:12:12Z") },
+        { _id: 8, item: "abc", price: 10, quantity: 5,  date: DateTime.parse("2021-03-16T20:20:13Z") }
+      ])
 
-    expect do
-      client.database.command(count: :sales)
-    end.to raise_error(Mongo::Error::OperationFailure)
+      # End Versioned API Example 5
 
-    # Start Versioned API Example 6
+      expect do
+        client.database.command(count: :sales)
+      end.to raise_error(Mongo::Error::OperationFailure)
 
-    # Mongo::Error::OperationFailure:
-    #   [323:APIStrictError]: Provided apiStrict:true, but the command count is not in API Version 1. Information on supported commands and migrations in API Version 1 can be found at https://dochub.mongodb.org/core/manual-versioned-api
+      # Start Versioned API Example 6
 
-    # End Versioned API Example 6
+      # Mongo::Error::OperationFailure:
+      #   [323:APIStrictError]: Provided apiStrict:true, but the command count is not in API Version 1. Information on supported commands and migrations in API Version 1 can be found at https://dochub.mongodb.org/core/manual-versioned-api
 
-    # Start Versioned API Example 7
+      # End Versioned API Example 6
 
-    client[:sales].count_documents
+      # Start Versioned API Example 7
 
-    # End Versioned API Example 7
+      client[:sales].count_documents
 
-    # Start Versioned API Example 8
+      # End Versioned API Example 7
 
-    # 8
+      # Start Versioned API Example 8
 
-    # End Versioned API Example 8
-    # Do not leak clients.
-    client.close
+      # 8
+
+      # End Versioned API Example 8
+      # Do not leak clients.
+      client.close
+    end
   end
 end

data/spec/lite_spec_helper.rb

@@ -10,10 +10,6 @@ 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").sort
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.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").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
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml").sort
@@ -36,7 +32,10 @@ else
   begin
     require 'byebug'
   rescue LoadError
-    require 'ruby-debug'
+    begin
+      require 'ruby-debug'
+    rescue LoadError
+    end
   end
 end
 
@@ -55,6 +54,8 @@ autoload :IceNine, 'ice_nine'
 autoload :Timecop, 'timecop'
 autoload :ChildProcess, 'childprocess'
 
+require 'rspec/retry'
+
 if BSON::Environment.jruby?
   require 'concurrent-ruby'
   PossiblyConcurrentArray = Concurrent::Array
@@ -81,20 +82,24 @@ require 'mrss/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
 require 'support/client_registry_macros'
+require 'support/mongos_macros'
+require 'support/macros'
 require 'support/crypt'
 require 'support/json_ext_formatter'
 require 'support/sdam_formatter_integration'
 require 'support/background_thread_registry'
-require 'support/session_registry'
+require 'mrss/session_registry'
 require 'support/local_resource_registry'
 
-if SpecConfig.instance.mri?
+if SpecConfig.instance.mri? && !SpecConfig.instance.windows?
   require 'timeout_interrupt'
 else
   require 'timeout'
   TimeoutInterrupt = Timeout
 end
 
+Mrss.patch_mongo_for_session_registry
+
 class ExampleTimeout < StandardError; end
 
 RSpec.configure do |config|
@@ -102,6 +107,8 @@ RSpec.configure do |config|
   config.include(CommonShortcuts::InstanceMethods)
   config.extend(Mrss::LiteConstraints)
   config.include(ClientRegistryMacros)
+  config.include(MongosMacros)
+  config.extend(Mongo::Macros)
 
   if SpecConfig.instance.ci?
     SdamFormatterIntegration.subscribe
@@ -118,14 +125,17 @@ RSpec.configure do |config|
   end
 
   if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
-    # Allow a max of 30 seconds per test.
     # Tests should take under 10 seconds ideally but it seems
     # we have some that run for more than 10 seconds in CI.
     config.around(:each) do |example|
       timeout = if %w(1 true yes).include?(ENV['STRESS']&.downcase)
         210
       else
-        45
+        if BSON::Environment.jruby?
+          90
+        else
+          45
+        end
       end
       TimeoutInterrupt.timeout(timeout, ExampleTimeout) do
         example.run

data/spec/mongo/address/ipv6_spec.rb

@@ -89,6 +89,13 @@ describe Mongo::Address::IPv6 do
 
   describe '#socket' do
 
+    # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+    # https://github.com/jruby/jruby/issues/7069
+    # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+    # because we intend to remove JRuby support altogether and therefore
+    # adding logic to condition on JRuby versions does not make sense.
+    fails_on_jruby
+
     let(:address) do
       '[::1]'
     end

data/spec/mongo/address_spec.rb

@@ -228,6 +228,13 @@ describe Mongo::Address do
 
     context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
 
+      # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+      # https://github.com/jruby/jruby/issues/7069
+      # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+      # because we intend to remove JRuby support altogether and therefore
+      # adding logic to condition on JRuby versions does not make sense.
+      fails_on_jruby
+
       let(:custom_hostname) do
         'not_localhost'
       end

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

@@ -33,32 +33,32 @@ describe Mongo::Auth::Scram::Conversation do
 
   describe '#start' do
 
-    let(:query) do
-      conversation.start(nil)
+    let(:msg) do
+      conversation.start(connection)
     end
 
     before do
       expect(SecureRandom).to receive(:base64).once.and_return('NDA2NzU3MDY3MDYwMTgy')
     end
 
-    let(:selector) do
-      query.selector
+    let(:command) do
+      msg.payload['command']
     end
 
     it 'sets the sasl start flag' do
-      expect(selector[:saslStart]).to eq(1)
+      expect(command[:saslStart]).to eq(1)
     end
 
     it 'sets the auto authorize flag' do
-      expect(selector[:autoAuthorize]).to eq(1)
+      expect(command[:autoAuthorize]).to eq(1)
     end
 
     it 'sets the mechanism' do
-      expect(selector[:mechanism]).to eq('SCRAM-SHA-1')
+      expect(command[:mechanism]).to eq('SCRAM-SHA-1')
     end
 
-    it 'sets the payload' do
-      expect(selector[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
+    it 'sets the command' do
+      expect(command[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
     end
   end
 
@@ -77,26 +77,26 @@ describe Mongo::Auth::Scram::Conversation do
         )
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
-      it 'sets the payload' do
-        expect(selector[:payload].data).to eq(
+      it 'sets the command' do
+        expect(command[:payload].data).to eq(
           'c=biws,r=NDA2NzU3MDY3MDYwMTgyt7/+IWaw1HaZZ5NmPJUTWapLpH2Gg+d8,p=qYUYNy6SQ9Jucq9rFA9nVgXQdbM='
         )
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 
@@ -135,26 +135,26 @@ describe Mongo::Auth::Scram::Conversation do
         BSON::Binary.new('v=gwo9E8+uifshm7ixj441GvIfuUY=')
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
         conversation.process_continue_response(finalize_document)
         conversation.finalize(connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
-      it 'sets the empty payload' do
-        expect(selector[:payload].data).to eq('')
+      it 'sets the empty command' do
+        expect(command[:payload].data).to eq('')
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end