mongo 2.17.2 → 2.18.1

data/spec/spec_tests/data/transactions_unified/retryable-abort-handshake.yml

@@ -0,0 +1,118 @@
+description: "retryable abortTransaction on handshake errors"
+
+schemaVersion: "1.4"
+
+runOnRequirements:
+  - minServerVersion: "4.2"
+    topologies: [replicaset, sharded, load-balanced]
+    serverless: "forbid"
+    auth: true
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents: [commandStartedEvent, connectionCheckOutStartedEvent]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &databaseName retryable-handshake-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collectionName coll
+  - session:
+      # This session will be used to execute the transaction
+      id: &session0 session0
+      client: *client0
+  - session:
+      # This session will be used to create the failPoint, and empty the pool
+      id: &session1 session1
+      client: *client0
+
+initialData:
+  - collectionName: *collectionName
+    databaseName: *databaseName
+    documents:
+      - { _id: 1, x: 11 }
+
+tests:
+  - description: "AbortTransaction succeeds after handshake network error"
+    skipReason: "DRIVERS-2032: Pinned servers need to be checked if they are still selectable"
+    operations:
+
+      - name: startTransaction
+        object: *session0
+
+      - name: insertOne
+        object: *collection0
+        arguments:
+          session: *session0
+          document: { _id: 2, x: 22 }
+
+      # The following failPoint and ping utilize session1 so that
+      # the transaction won't be failed by the intentional erroring of ping
+      # and it will have an empty pool when it goes to run abortTransaction
+      - name: failPoint # fail the next connection establishment
+        object: testRunner
+        arguments:
+          client: *client0
+          session: *session1
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+              # use saslContinue here to avoid SDAM errors
+              # this failPoint itself will create a usable connection in the connection pool
+              # so we run a ping (with closeConnection: true) in order to discard the connection
+              # before testing that abortTransaction will fail a handshake but will get retried
+              failCommands: [saslContinue, ping]
+              closeConnection: true
+
+      - name: runCommand
+        object: *database0
+        arguments:
+          commandName: ping
+          command: { ping: 1 }
+          session: *session1
+        expectError:
+          isError: true
+
+      - name: abortTransaction
+        object: *session0
+
+    expectEvents:
+      - client: *client0
+        eventType: cmap
+        events:
+          - { connectionCheckOutStartedEvent: {} } # startTransaction
+          - { connectionCheckOutStartedEvent: {} } # insertOne
+          - { connectionCheckOutStartedEvent: {} } # failPoint
+          - { connectionCheckOutStartedEvent: {} } # abortTransaction
+          - { connectionCheckOutStartedEvent: {} } # abortTransaction retry
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collectionName
+                documents: [{ _id: 2, x: 22 }]
+                startTransaction: true
+              commandName: insert
+              databaseName: *databaseName
+          - commandStartedEvent:
+              command:
+                ping: 1
+              databaseName: *databaseName
+          - commandStartedEvent:
+              command:
+                abortTransaction: 1
+                lsid:
+                  $$sessionLsid: *session0
+              commandName: abortTransaction
+              databaseName: admin
+
+    outcome:
+      - collectionName: *collectionName
+        databaseName: *databaseName
+        documents:
+          - { _id: 1, x: 11 }

data/spec/spec_tests/data/transactions_unified/retryable-commit-handshake.yml

@@ -0,0 +1,118 @@
+description: "retryable commitTransaction on handshake errors"
+
+schemaVersion: "1.4"
+
+runOnRequirements:
+  - minServerVersion: "4.2"
+    topologies: [replicaset, sharded, load-balanced]
+    serverless: "forbid"
+    auth: true
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents: [commandStartedEvent, connectionCheckOutStartedEvent]
+      uriOptions: { retryWrites: false } # commitTransaction is retryable regardless of this option being set
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &databaseName retryable-handshake-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collectionName coll
+  - session:
+      id: &session0 session0
+      client: *client0
+  - session:
+      id: &session1 session1
+      client: *client0
+
+initialData:
+  - collectionName: *collectionName
+    databaseName: *databaseName
+    documents:
+      - { _id: 1, x: 11 }
+
+tests:
+  - description: "CommitTransaction succeeds after handshake network error"
+    skipReason: "DRIVERS-2032: Pinned servers need to be checked if they are still selectable"
+    operations:
+
+      - name: startTransaction
+        object: *session0
+
+      - name: insertOne
+        object: *collection0
+        arguments:
+          session: *session0
+          document: { _id: 2, x: 22 }
+
+      # The following failPoint and ping utilize session1 so that
+      # the transaction won't be failed by the intentional erroring of ping
+      # and it will have an empty pool when it goes to run commitTransaction
+      - name: failPoint # fail the next connection establishment
+        object: testRunner
+        arguments:
+          client: *client0
+          session: *session1
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+              # use saslContinue here to avoid SDAM errors
+              # this failPoint itself will create a usable connection in the connection pool
+              # so we run a ping (that also fails) in order to discard the connection
+              # before testing that commitTransaction gets retried
+              failCommands: [saslContinue, ping]
+              closeConnection: true
+
+      - name: runCommand
+        object: *database0
+        arguments:
+          commandName: ping
+          command: { ping: 1 }
+          session: *session1
+        expectError:
+          isError: true
+
+      - name: commitTransaction
+        object: *session0
+
+    expectEvents:
+      - client: *client0
+        eventType: cmap
+        events:
+          - { connectionCheckOutStartedEvent: {} } # startTransaction
+          - { connectionCheckOutStartedEvent: {} } # insertOne
+          - { connectionCheckOutStartedEvent: {} } # failPoint
+          - { connectionCheckOutStartedEvent: {} } # commitTransaction
+          - { connectionCheckOutStartedEvent: {} } # commitTransaction retry
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collectionName
+                documents: [{ _id: 2, x: 22 }]
+                startTransaction: true
+              commandName: insert
+              databaseName: *databaseName
+          - commandStartedEvent:
+              command:
+                ping: 1
+              databaseName: *databaseName
+          - commandStartedEvent:
+              command:
+                commitTransaction: 1
+                lsid:
+                  $$sessionLsid: *session0
+              commandName: commitTransaction
+              databaseName: admin
+
+    outcome:
+      - collectionName: *collectionName
+        databaseName: *databaseName
+        documents:
+          - { _id: 1, x: 11 }
+          - { _id: 2, x: 22 } # The write was still applied

data/spec/spec_tests/data/unified/invalid/expectedEventsForClient-ignoreExtraEvents-type.yml

@@ -0,0 +1,15 @@
+description: "expectedEventsForClient-ignoreExtraEvents-type"
+
+schemaVersion: "1.7"
+
+createEntities:
+  - client:
+      id: &client0 "client0"
+
+tests:
+  - description: "foo"
+    operations: []
+    expectEvents:
+      - client: *client0
+        events: []
+        ignoreExtraEvents: 0

data/spec/spec_tests/data/unified/valid-fail/operation-unsupported.yml

@@ -0,0 +1,13 @@
+description: "operation-unsupported"
+
+schemaVersion: "1.0"
+
+createEntities:
+  - client:
+      id: &client0 client0
+
+tests:
+  - description: "Unsupported operation"
+    operations:
+      - name: unsupportedOperation
+        object: *client0

data/spec/spec_tests/data/unified/valid-pass/expectedEventsForClient-ignoreExtraEvents.yml

@@ -0,0 +1,78 @@
+description: expectedEventsForClient-ignoreExtraEvents
+
+schemaVersion: '1.7'
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: true
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name database0Name
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name coll0
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents: []
+
+tests:
+  - description: ignoreExtraEvents can be set to false
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: &insertDocument1 { _id: 1 }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: false
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents:
+                  - *insertDocument1
+              commandName: insert
+
+  - description: ignoreExtraEvents can be set to true
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: &insertDocument2 { _id: 2 }
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 3 }
+    expectEvents:
+      - client: *client0
+        ignoreExtraEvents: true
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents:
+                  - *insertDocument2
+              commandName: insert
+
+  - description: ignoreExtraEvents defaults to false if unset
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: &insertDocument4 { _id: 4 }
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents:
+                  - *insertDocument4
+              commandName: insert

data/spec/spec_tests/data/unified/valid-pass/poc-change-streams.yml

@@ -1,6 +1,9 @@
 description: "poc-change-streams"
 
-schemaVersion: "1.0"
+schemaVersion: "1.4"
+
+runOnRequirements:
+  - serverless: forbid
 
 createEntities:
   # Entities for creating changeStreams

data/spec/spec_tests/data/unified/valid-pass/poc-command-monitoring.yml

@@ -29,9 +29,10 @@ initialData:
       - { _id: 5, x: 55 }
 
 tests:
-  - description: "A successful find event with a getmore and the server kills the cursor"
+  - description: "A successful find event with a getmore and the server kills the cursor (<= 4.4)"
     runOnRequirements:
       - minServerVersion: "3.1"
+        maxServerVersion: "4.4.99"
         topologies: [ single, replicaset ]
     operations:
       - name: find
@@ -68,8 +69,7 @@ tests:
               command:
                 getMore: { $$type: [ int, long ] }
                 collection: *collection0Name
-                # https://jira.mongodb.org/browse/RUBY-2443
-                batchSize: 3
+                batchSize: 1
               commandName: getMore
               databaseName: *database0Name
           - commandSucceededEvent:

data/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml

@@ -34,11 +34,12 @@ tests:
     operations:
       - name: startTransaction
         object: *session0
-      - name: insertOne
+      - name: updateOne
         object: *collection0
         arguments:
           session: *session0
-          document: { _id: { .: . } }
+          filter: { _id: 1 }
+          update: { x: 1 }
         # Original test only asserted a generic error
         expectError: { isClientError: true }
       - name: assertSessionTransactionState

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

@@ -0,0 +1,96 @@
+tests:
+    - description: "SRV URI with custom srvServiceName"
+      uri: "mongodb+srv://test22.test.build.10gen.cc/?srvServiceName=customname"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          srvServiceName: "customname"
+          tls: true
+    - description: "Non-SRV URI with custom srvServiceName"
+      uri: "mongodb://example.com/?srvServiceName=customname"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    - description: "SRV URI with srvMaxHosts"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          srvMaxHosts: 2
+          tls: true
+    - description: "SRV URI with negative integer for srvMaxHosts"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=-1"
+      valid: true
+      warning: true
+      hosts: ~
+      auth: ~
+      options:
+        tls: true
+    - description: "SRV URI with invalid type for srvMaxHosts"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=foo"
+      valid: true
+      warning: true
+      hosts: ~
+      auth: ~
+      options:
+        tls: true
+    - description: "Non-SRV URI with srvMaxHosts"
+      uri: "mongodb://example.com/?srvMaxHosts=2"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    # Note: Testing URI validation for srvMaxHosts conflicting with either
+    # loadBalanced=true or replicaSet specified via TXT records is covered by
+    # the Initial DNS Seedlist Discovery test suite.
+    - description: "SRV URI with positive srvMaxHosts and replicaSet"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2&replicaSet=foo"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    - description: "SRV URI with positive srvMaxHosts and loadBalanced=true"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2&loadBalanced=true"
+      valid: false
+      warning: false
+      hosts: ~
+      auth: ~
+      options: {}
+    - description: "SRV URI with positive srvMaxHosts and loadBalanced=false"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2&loadBalanced=false"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: false
+          srvMaxHosts: 2
+          tls: true
+    - description: "SRV URI with srvMaxHosts=0 and replicaSet"
+      uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=0&replicaSet=foo"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          replicaSet: foo
+          srvMaxHosts: 0
+          tls: true
+    - description: "SRV URI with srvMaxHosts=0 and loadBalanced=true"
+      uri: "mongodb+srv://test3.test.build.10gen.cc/?srvMaxHosts=0&loadBalanced=true"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: true
+          srvMaxHosts: 0
+          tls: true

data/spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml

@@ -229,6 +229,11 @@ tests:
                 <<: *expectedApiVersion
 
   - description: "estimatedDocumentCount appends declared API version"
+    # See: https://jira.mongodb.org/browse/SERVER-63850
+    runOnRequirements:
+      - minServerVersion: "5.0.8"
+        maxServerVersion: "5.0.99"
+      - minServerVersion: "5.3.2"
     operations:
       - name: estimatedDocumentCount
         object: *collection
@@ -238,10 +243,7 @@ tests:
         events:
           - commandStartedEvent:
               command:
-                aggregate: *collectionName
-                pipeline: &pipeline
-                  - $collStats: { count: {} }
-                  - $group: { _id: 1, n: { $sum: $count }}
+                count: *collectionName
                 <<: *expectedApiVersion
 
   - description: "find and getMore append API version"

data/spec/spec_tests/data/versioned_api/crud-api-version-1.yml

@@ -222,7 +222,12 @@ tests:
                 key: x
                 <<: *expectedApiVersion
 
-  - description: "estimatedDocumentCount appends declared API version on 4.9.0 or greater"
+  - description: "estimatedDocumentCount appends declared API version"
+    # See: https://jira.mongodb.org/browse/SERVER-63850
+    runOnRequirements:
+      - minServerVersion: "5.0.8"
+        maxServerVersion: "5.0.99"
+      - minServerVersion: "5.3.2"
     operations:
       - name: estimatedDocumentCount
         object: *collection
@@ -232,10 +237,7 @@ tests:
         events:
           - commandStartedEvent:
               command:
-                aggregate: *collectionName
-                pipeline: &pipeline
-                  - $collStats: { count: {} }
-                  - $group: { _id: 1, n: { $sum: $count }}
+                count: *collectionName
                 <<: *expectedApiVersion
 
   - description: "find and getMore append API version"

data/spec/spec_tests/gridfs_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/gridfs_unified"
+GRIDFS_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'GridFS unified spec tests' do
+  define_unified_spec_tests(base, GRIDFS_UNIFIED_TESTS)
+end

data/spec/spec_tests/retryable_reads_spec.rb

@@ -5,7 +5,10 @@ require 'spec_helper'
 
 require 'runners/crud'
 
-describe 'Retryable reads spec tests' do
+base = "#{CURRENT_PATH}/spec_tests/data/retryable_reads"
+RETRYABLE_READS_TESTS = Dir.glob("#{base}/legacy/**/*.yml").sort
+
+describe 'Retryable reads legacy spec tests' do
   require_wired_tiger
   require_no_multi_mongos
 

data/spec/spec_tests/retryable_reads_unified_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/retryable_reads"
+RETRYABLE_READ_UNIFIED_TESTS = Dir.glob("#{base}/unified/**/*.yml").sort
+
+describe 'Retryable reads spec tests - unified' do
+  require_wired_tiger
+  require_no_multi_mongos
+
+  define_unified_spec_tests(base, RETRYABLE_READ_UNIFIED_TESTS) do |spec, req, test|
+    let(:client) do
+      authorized_client.use(spec.database_name).with({max_read_retries: 0}.update(test.client_options)).tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
+      end
+    end
+  end
+end

data/spec/spec_tests/retryable_writes_spec.rb

@@ -5,7 +5,10 @@ require 'spec_helper'
 
 require 'runners/crud'
 
-describe 'Retryable writes spec tests' do
+base = "#{CURRENT_PATH}/spec_tests/data/retryable_writes"
+RETRYABLE_WRITES_TESTS = Dir.glob("#{base}/legacy/**/*.yml").sort
+
+describe 'Retryable writes spec tests - legacy' do
   require_wired_tiger
   require_no_multi_mongos
 

data/spec/spec_tests/retryable_writes_unified_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/retryable_writes"
+RETRYABLE_WRITE_UNIFIED_TESTS = Dir.glob("#{base}/unified/**/*.yml").sort
+
+describe 'Retryable reads spec tests - unified' do
+  require_wired_tiger
+  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
+  # is simply redundant.
+  require_retry_writes
+
+  define_unified_spec_tests(base, RETRYABLE_WRITE_UNIFIED_TESTS)
+end

data/spec/spec_tests/seed_list_discovery_spec.rb

@@ -5,6 +5,7 @@ require 'lite_spec_helper'
 
 require 'support/using_hash'
 require 'runners/connection_string'
+require 'mrss/lite_constraints'
 
 SEED_LIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/seed_list_discovery/**/*.yml").sort
 
@@ -23,6 +24,7 @@ describe 'DNS Seedlist Discovery' do
 
       if test.raise_error?
         context 'the uri is invalid' do
+          retry_test
 
           let(:valid_errors) do
             [
@@ -43,6 +45,7 @@ describe 'DNS Seedlist Discovery' do
             ex
           end
 
+          # In Evergreen sometimes this test fails intermittently.
           it 'raises an error' do
             expect(valid_errors).to include(error.class)
           end
@@ -51,7 +54,8 @@ describe 'DNS Seedlist Discovery' do
       else
 
         context 'the uri is valid' do
-
+          retry_test
+          # In Evergreen sometimes this test fails intermittently.
           it 'does not raise an exception' do
             expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
           end
@@ -66,6 +70,11 @@ describe 'DNS Seedlist Discovery' do
             it 'creates a client with the correct seeds' do
               expect(test.client).to have_hosts(test, test.seeds)
             end
+          elsif test.num_seeds
+            it 'has the right number of seeds' do
+              num_servers = test.client.cluster.servers_list.length
+              expect(num_servers).to eq(test.num_seeds)
+            end
           else
             it 'creates a client with the correct hosts' do
               expect(test.client).to have_hosts(test, test.hosts)