mongo 2.17.2 → 2.18.1

data/spec/spec_tests/data/seed_list_discovery/replica-set/srv-service-name.yml

@@ -0,0 +1,11 @@
+uri: "mongodb+srv://test22.test.build.10gen.cc/?srvServiceName=customname"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    ssl: true
+    srvServiceName: "customname"

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet-txt.yml

@@ -0,0 +1,5 @@
+uri: "mongodb+srv://test5.test.build.10gen.cc/?srvMaxHosts=1"
+seeds: []
+hosts: []
+error: true
+comment: Should fail because positive integer for srvMaxHosts conflicts with replicaSet option (TXT)

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-conflicts_with_replicaSet.yml

@@ -0,0 +1,5 @@
+uri: "mongodb+srv://test1.test.build.10gen.cc/?replicaSet=repl0&srvMaxHosts=1"
+seeds: []
+hosts: []
+error: true
+comment: Should fail because positive integer for srvMaxHosts conflicts with replicaSet option

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-equal_to_srv_records.yml

@@ -0,0 +1,16 @@
+# When srvMaxHosts equals the number of SRV records, all hosts are added to the
+# seed list.
+#
+# The replicaSet URI option is omitted to avoid a URI validation error.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2"
+numSeeds: 2
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    srvMaxHosts: 2
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-greater_than_srv_records.yml

@@ -0,0 +1,15 @@
+# When srvMaxHosts is greater than the number of SRV records, all hosts are
+# added to the seed list.
+#
+# The replicaSet URI option is omitted to avoid a URI validation error.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=3"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    srvMaxHosts: 3
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-less_than_srv_records.yml

@@ -0,0 +1,15 @@
+# When srvMaxHosts is less than the number of SRV records, a random subset of
+# hosts are added to the seed list. We cannot anticipate which hosts will be
+# selected, so this test uses numSeeds instead of seeds. Since this is a replica
+# set, all hosts should ultimately be discovered by SDAM.
+#
+# The replicaSet URI option is omitted to avoid a URI validation error.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=1"
+numSeeds: 1
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    srvMaxHosts: 1
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero-txt.yml

@@ -0,0 +1,15 @@
+# When srvMaxHosts is zero, all hosts are added to the seed list.
+#
+# replicaSet (TXT) is permitted because srvMaxHosts is non-positive.
+uri: "mongodb+srv://test5.test.build.10gen.cc/?srvMaxHosts=0"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    authSource: thisDB
+    replicaSet: repl0
+    srvMaxHosts: 0
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/replica-set/srvMaxHosts-zero.yml

@@ -0,0 +1,15 @@
+# When srvMaxHosts is zero, all hosts are added to the seed list.
+#
+# replicaSet is permitted because srvMaxHosts is non-positive.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?replicaSet=repl0&srvMaxHosts=0"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost:27017
+    - localhost:27018
+    - localhost:27019
+options:
+    replicaSet: repl0
+    srvMaxHosts: 0
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-equal_to_srv_records.yml

@@ -0,0 +1,13 @@
+# When srvMaxHosts equals the number of SRV records, all hosts are added to the
+# seed list.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=2"
+numSeeds: 2
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+options:
+    srvMaxHosts: 2
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-greater_than_srv_records.yml

@@ -0,0 +1,12 @@
+# When srvMaxHosts is greater than the number of SRV records, all hosts are
+# added to the seed list.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=3"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+options:
+    srvMaxHosts: 3
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-less_than_srv_records.yml

@@ -0,0 +1,10 @@
+# When srvMaxHosts is less than the number of SRV records, a random subset of
+# hosts are added to the seed list. We cannot anticipate which hosts will be
+# selected, so this test uses numSeeds and numHosts instead of seeds and hosts,
+# respectively.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=1"
+numSeeds: 1
+numHosts: 1
+options:
+    srvMaxHosts: 1
+    ssl: true

data/spec/spec_tests/data/seed_list_discovery/sharded/srvMaxHosts-zero.yml

@@ -0,0 +1,11 @@
+# When srvMaxHosts is zero, all hosts are added to the seed list.
+uri: "mongodb+srv://test1.test.build.10gen.cc/?srvMaxHosts=0"
+seeds:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+hosts:
+    - localhost.test.build.10gen.cc:27017
+    - localhost.test.build.10gen.cc:27018
+options:
+    srvMaxHosts: 0
+    ssl: true

data/spec/spec_tests/data/server_selection/Unknown/read/ghost.yml

@@ -0,0 +1,11 @@
+topology_description:
+  type: Unknown
+  servers:
+  - address: a:27017
+    avg_rtt_ms: 5
+    type: RSGhost
+operation: read
+read_preference:
+  mode: Nearest
+suitable_servers: []
+in_latency_window: []

data/spec/spec_tests/data/server_selection/Unknown/write/ghost.yml

@@ -0,0 +1,11 @@
+topology_description:
+  type: Unknown
+  servers:
+  - address: a:27017
+    avg_rtt_ms: 5
+    type: RSGhost
+operation: write
+read_preference:
+  mode: Nearest
+suitable_servers: []
+in_latency_window: []

data/spec/spec_tests/data/sessions_unified/driver-sessions-server-support.yml

@@ -0,0 +1,123 @@
+description: "driver-sessions-server-support"
+
+schemaVersion: "1.0"
+
+runOnRequirements:
+  - minServerVersion: "3.6"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents: [ commandStartedEvent ]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name session-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name test
+  - session:
+      id: &session0 session0
+      client: *client0
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents:
+      - { _id: 1 }
+
+tests:
+  - description: "Server supports explicit sessions"
+    operations:
+      - name: assertSessionNotDirty
+        object: testRunner
+        arguments:
+          session: *session0
+      - name: insertOne
+        object: *collection0
+        arguments:
+          session: *session0
+          document: { _id: 2 }
+        expectResult: { $$unsetOrMatches: { insertedId: { $$unsetOrMatches: 2 } } }
+      - name: assertSessionNotDirty
+        object: testRunner
+        arguments:
+          session: *session0
+      - name: endSession
+        object: *session0
+      - &find_with_implicit_session
+        name: find
+        object: *collection0
+        arguments:
+          filter: { _id: -1 }
+        expectResult: []
+      - name: assertSameLsidOnLastTwoCommands
+        object: testRunner
+        arguments:
+          client: *client0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents: [ { _id: 2 } ]
+                ordered: true
+                lsid: { $$sessionLsid: *session0 }
+              commandName: insert
+              databaseName: *database0Name
+          - commandStartedEvent:
+              command:
+                find: *collection0Name
+                filter: { _id: -1 }
+                lsid: { $$sessionLsid: *session0 }
+              commandName: find
+              databaseName: *database0Name
+    outcome:
+      - collectionName: *collection0Name
+        databaseName: *database0Name
+        documents:
+          - { _id: 1 }
+          - { _id: 2 }
+
+  - description: "Server supports implicit sessions"
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: { _id: 2 }
+        expectResult: { $$unsetOrMatches: { insertedId: { $$unsetOrMatches: 2 } } }
+      - *find_with_implicit_session
+      - name: assertSameLsidOnLastTwoCommands
+        object: testRunner
+        arguments:
+          client: *client0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents:
+                  - { _id: 2 }
+                ordered: true
+                # There is no explicit session to use with $$sessionLsid, so
+                # just assert an arbitrary lsid document
+                lsid: { $$type: object }
+              commandName: insert
+              databaseName: *database0Name
+          - commandStartedEvent:
+              command:
+                find: *collection0Name
+                filter: { _id: -1 }
+                lsid: { $$type: object }
+              commandName: find
+              databaseName: *database0Name
+    outcome:
+      - collectionName: *collection0Name
+        databaseName: *database0Name
+        documents:
+          - { _id: 1 }
+          - { _id: 2 }

data/spec/spec_tests/data/sessions_unified/snapshot-sessions-not-supported-client-error.yml

@@ -41,7 +41,9 @@ tests:
     expectError:
       isClientError: true
       errorContains: Snapshot reads require MongoDB 5.0 or later
-  expectEvents: []
+  expectEvents:
+    - client: *client0
+      events: []
 
 - description: Client error on aggregate with snapshot
   operations:
@@ -53,7 +55,9 @@ tests:
     expectError:
       isClientError: true
       errorContains: Snapshot reads require MongoDB 5.0 or later
-  expectEvents: []
+  expectEvents:
+    - client: *client0
+      events: []
 
 - description: Client error on distinct with snapshot
   operations:
@@ -66,4 +70,6 @@ tests:
     expectError:
       isClientError: true
       errorContains: Snapshot reads require MongoDB 5.0 or later
-  expectEvents: []
+  expectEvents:
+    - client: *client0
+      events: []

data/spec/spec_tests/data/transactions/error-labels.yml

@@ -590,10 +590,10 @@ tests:
       mode: { times: 2 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 91
             errmsg: Replication is being shut down
-            errorLabels: ["RetryableWriteError"]
 
     operations:
       - name: startTransaction

data/spec/spec_tests/data/transactions/errors-client.yml

@@ -16,12 +16,12 @@ tests:
     operations:
       - name: startTransaction
         object: session0
-      - name: insertOne
+      - name: updateOne
         object: collection
         arguments:
           session: session0
-          document:
-            _id: {.: .}
+          filter: { _id: 1 }
+          update: { x: 1 }
         error: true
       - name: assertSessionTransactionState
         object: testRunner
@@ -38,16 +38,15 @@ tests:
         object: collection
         arguments:
           session: session0
-          document:
-            _id: 4
+          document: { _id: 1 }
         result:
-          insertedId: 4
-      - name: insertOne
+          insertedId: 1
+      - name: updateOne
         object: collection
         arguments:
           session: session0
-          document:
-            _id: {.: .}
+          filter: { _id: 1 }
+          update: { x: 1 }
         error: true
       - name: assertSessionTransactionState
         object: testRunner

data/spec/spec_tests/data/transactions/mongos-recovery-token.yml

@@ -118,10 +118,10 @@ tests:
             mode: { times: 1 }
             data:
               failCommands: ["commitTransaction"]
+              errorLabels: ["RetryableWriteError"]
               writeConcernError:
                 code: 91
                 errmsg: Replication is being shut down
-                errorLabels: ["RetryableWriteError"]
       # The client sees a retryable writeConcernError on the first
       # commitTransaction due to the fail point but it actually succeeds on the
       # server (SERVER-39346). The retry will succeed both on a new mongos and

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

@@ -2,8 +2,6 @@ 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,8 +5,6 @@ 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"
@@ -268,7 +266,7 @@ tests:
       collection:
         data: []
 
-  - description: abortTransaction succeeds after NotMaster
+  - description: abortTransaction succeeds after NotWritablePrimary
 
     failPoint:
       configureFailPoint: failCommand
@@ -336,7 +334,7 @@ tests:
       collection:
         data: []
 
-  - description: abortTransaction succeeds after NotMasterOrSecondary
+  - description: abortTransaction succeeds after NotPrimaryOrSecondary
 
     failPoint:
       configureFailPoint: failCommand
@@ -404,7 +402,7 @@ tests:
       collection:
         data: []
 
-  - description: abortTransaction succeeds after NotMasterNoSlaveOk
+  - description: abortTransaction succeeds after NotPrimaryNoSecondaryOk
 
     failPoint:
       configureFailPoint: failCommand
@@ -1023,9 +1021,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11600
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1098,9 +1096,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11602
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1173,9 +1171,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 189
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1248,9 +1246,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["abortTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 91
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:

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

@@ -2,8 +2,6 @@ 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,8 +5,6 @@ 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"
@@ -387,7 +385,7 @@ tests:
         data:
           - _id: 1
 
-  - description: commitTransaction succeeds after NotMaster
+  - description: commitTransaction succeeds after NotWritablePrimary
 
     failPoint:
       configureFailPoint: failCommand
@@ -457,7 +455,7 @@ tests:
         data:
           - _id: 1
 
-  - description: commitTransaction succeeds after NotMasterOrSecondary
+  - description: commitTransaction succeeds after NotPrimaryOrSecondary
 
     failPoint:
       configureFailPoint: failCommand
@@ -527,7 +525,7 @@ tests:
         data:
           - _id: 1
 
-  - description: commitTransaction succeeds after NotMasterNoSlaveOk
+  - description: commitTransaction succeeds after NotPrimaryNoSecondaryOk
 
     failPoint:
       configureFailPoint: failCommand
@@ -1164,9 +1162,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11600
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1240,9 +1238,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 11602
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1316,9 +1314,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 189
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:
@@ -1392,9 +1390,9 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["commitTransaction"]
+          errorLabels: ["RetryableWriteError"]
           writeConcernError:
             code: 91
-            errorLabels: ["RetryableWriteError"]
             errmsg: Replication is being shut down
 
     operations:

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

@@ -5,8 +5,6 @@ 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_unified/do-not-retry-read-in-transaction.yml

@@ -0,0 +1,64 @@
+description: "do not retry read in a transaction"
+
+schemaVersion: "1.4"
+
+runOnRequirements:
+  - minServerVersion: "4.0.0"
+    topologies: [ replicaset ]
+  - minServerVersion: "4.2.0"
+    topologies: [ sharded, load-balanced ]
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents: [commandStartedEvent]
+      uriOptions: { retryReads: true }
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &databaseName retryable-read-in-transaction-test
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collectionName coll
+  - session:
+      id: &session0 session0
+      client: *client0
+
+tests:
+  - description: "find does not retry in a transaction"
+    operations:
+
+      - name: startTransaction
+        object: *session0
+
+      - name: failPoint # fail the following find command
+        object: testRunner
+        arguments:
+          client: *client0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [find]
+              closeConnection: true
+
+      - name: find
+        object: *collection0
+        arguments:
+          filter: {}
+          session: *session0
+        expectError:
+          isError: true
+          errorLabelsContain: ["TransientTransactionError"]
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                find: *collectionName
+                filter: {}
+                startTransaction: true
+              commandName: find
+              databaseName: *databaseName