mongo 2.9.2 → 2.10.0.rc0

data/spec/spec_tests/data/transactions_api/callback-aborts.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -12,6 +15,7 @@ tests:
   -
     # Session state will be ABORTED when callback returns to withTransaction
     description: withTransaction succeeds if callback aborts
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction
@@ -66,6 +70,7 @@ tests:
   -
     # Session state will be ABORTED when callback returns to withTransaction
     description: withTransaction succeeds if callback aborts with no ops
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction
@@ -83,6 +88,7 @@ tests:
   -
     # Session state will be NO_TXN when callback returns to withTransaction
     description: withTransaction still succeeds if callback aborts and runs extra op
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction

data/spec/spec_tests/data/transactions_api/callback-commits.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -12,6 +15,7 @@ tests:
   -
     # Session state will be COMMITTED when callback returns to withTransaction
     description: withTransaction succeeds if callback commits
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction
@@ -92,6 +96,7 @@ tests:
   -
     # Session state will be NO_TXN when callback returns to withTransaction
     description: withTransaction still succeeds if callback commits and runs extra op
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction

data/spec/spec_tests/data/transactions_api/callback-retry.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -132,6 +135,7 @@ tests:
           - { _id: 1 }
   -
     description: callback is not retried after non-transient error (DuplicateKeyError)
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction
@@ -154,10 +158,11 @@ tests:
                   session: session0
                   document: { _id: 1 }
                 result:
-                  errorCodeName: DuplicateKey
                   errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
         result:
-          errorCodeName: DuplicateKey
+          # Don't assert on errorCodeName because (after SERVER-38583) the
+          # DuplicateKey is reported in writeErrors, not as a top-level
+          # command error.
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
     expectations:
       -

data/spec/spec_tests/data/transactions_api/commit-retry.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -18,7 +21,7 @@ tests:
           failCommands: ["commitTransaction"]
           closeConnection: true
     operations:
-      -
+      - &withTransaction
         name: withTransaction
         object: session0
         arguments:
@@ -191,20 +194,7 @@ tests:
           errorCode: 10107 # NotMaster
           closeConnection: false
     operations:
-      -
-        name: withTransaction
-        object: session0
-        arguments:
-          callback:
-            operations:
-              -
-                name: insertOne
-                object: collection
-                arguments:
-                  session: session0
-                  document: { _id: 1 }
-                result:
-                  insertedId: 1
+      - *withTransaction
     expectations:
       -
         command_started_event:
@@ -267,3 +257,68 @@ tests:
       collection:
         data:
           - { _id: 1 }
+  -
+    description: commit is not retried after MaxTimeMSExpired error
+    failPoint:
+      configureFailPoint: failCommand
+      mode: { times: 1 }
+      data:
+          failCommands: ["commitTransaction"]
+          errorCode: 50 # MaxTimeMSExpired
+    operations:
+      - name: withTransaction
+        object: session0
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
+          options:
+            maxCommitTimeMS: 60000
+        result:
+          errorCodeName: MaxTimeMSExpired
+          errorLabelsContain: ["UnknownTransactionCommitResult"]
+          errorLabelsOmit: ["TransientTransactionError"]
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 1 }
+            ordered: true
+            lsid: session0
+            txnNumber: { $numberLong: "1" }
+            startTransaction: true
+            autocommit: false
+            # omitted fields
+            readConcern: ~
+            writeConcern: ~
+          command_name: insert
+          database_name: *database_name
+      -
+        command_started_event:
+          command:
+            commitTransaction: 1
+            lsid: session0
+            txnNumber: { $numberLong: "1" }
+            autocommit: false
+            maxTimeMS: 60000
+            # omitted fields
+            readConcern: ~
+            startTransaction: ~
+            writeConcern: ~
+          command_name: commitTransaction
+          database_name: admin
+    outcome:
+      collection:
+        # In reality, the outcome of the commit is unknown but we fabricate
+        # the error with failCommand.errorCode which does not apply the commit
+        # operation.
+        data: []

data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.1.6"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -10,10 +13,10 @@ data: []
 
 tests:
   -
-    description: commitTransaction is not retried after WriteConcernFailed timeout error
+    description: commitTransaction is retried after WriteConcernFailed timeout error
     failPoint:
       configureFailPoint: failCommand
-      mode: { times: 1 }
+      mode: { times: 2 }
       data:
           failCommands: ["commitTransaction"]
           # Do not specify closeConnection: false, since that would conflict
@@ -24,10 +27,10 @@ tests:
             errmsg: "waiting for replication timed out"
             errInfo: { wtimeout: true }
     operations:
-      -
+      - &operation
         name: withTransaction
         object: session0
-        arguments: &arguments
+        arguments:
           callback:
             operations:
               -
@@ -38,71 +41,7 @@ tests:
                   document: { _id: 1 }
                 result:
                   insertedId: 1
-        result:
-          errorCodeName: WriteConcernFailed
-          # Per transactions spec, drivers add UnknownTransactionCommitResult
-          # label for WriteConcernFailed errors; however, neither the driver
-          # nor withTransaction() will retry the commit in this case.
-          errorLabelsContain: ["UnknownTransactionCommitResult"]
-          errorLabelsOmit: ["TransientTransactionError"]
-    expectations:
-      -
-        command_started_event:
-          command:
-            insert: *collection_name
-            documents:
-              - { _id: 1 }
-            ordered: true
-            lsid: session0
-            txnNumber: { $numberLong: "1" }
-            startTransaction: true
-            autocommit: false
-            # omitted fields
-            readConcern: ~
-            writeConcern: ~
-          command_name: insert
-          database_name: *database_name
-      -
-        command_started_event:
-          command:
-            commitTransaction: 1
-            lsid: session0
-            txnNumber: { $numberLong: "1" }
-            autocommit: false
-            # omitted fields
-            readConcern: ~
-            startTransaction: ~
-            writeConcern: ~
-          command_name: commitTransaction
-          database_name: admin
-    # The write operation is still applied despite the write concern error
-    outcome: &outcome
-      collection:
-        data:
-          - { _id: 1 }
-  -
-    # This test configures the fail point to return an error with the
-    # WriteConcernFailed code but without errInfo that would identify it as a
-    # wtimeout error. This tests that drivers do not assume that all
-    # WriteConcernFailed errors are due to a replication timeout.
-    description: commitTransaction is retried after WriteConcernFailed non-timeout error
-    failPoint:
-      configureFailPoint: failCommand
-      mode: { times: 2 }
-      data:
-          failCommands: ["commitTransaction"]
-          # Do not specify closeConnection: false, since that would conflict
-          # with writeConcernError (see: SERVER-39292)
-          writeConcernError:
-            code: 64
-            codeName: WriteConcernFailed
-            errmsg: "multiple errors reported"
-    operations:
-      -
-        name: withTransaction
-        object: session0
-        arguments: *arguments
-    expectations:
+    expectations: &expectations_with_retries
       -
         command_started_event:
           command:
@@ -160,10 +99,32 @@ tests:
             startTransaction: ~
           command_name: commitTransaction
           database_name: admin
-    outcome:
+    # The write operation is still applied despite the write concern error
+    outcome: &outcome
       collection:
         data:
           - { _id: 1 }
+  -
+    # This test configures the fail point to return an error with the
+    # WriteConcernFailed code but without errInfo that would identify it as a
+    # wtimeout error. This tests that drivers do not assume that all
+    # WriteConcernFailed errors are due to a replication timeout.
+    description: commitTransaction is retried after WriteConcernFailed non-timeout error
+    failPoint:
+      configureFailPoint: failCommand
+      mode: { times: 2 }
+      data:
+          failCommands: ["commitTransaction"]
+          # Do not specify closeConnection: false, since that would conflict
+          # with writeConcernError (see: SERVER-39292)
+          writeConcernError:
+            code: 64
+            codeName: WriteConcernFailed
+            errmsg: "multiple errors reported"
+    operations:
+      - *operation
+    expectations: *expectations_with_retries
+    outcome: *outcome
   -
     description: commitTransaction is not retried after UnknownReplWriteConcern error
     failPoint:
@@ -176,14 +137,11 @@ tests:
             codeName: UnknownReplWriteConcern
             errmsg: "No write concern mode named 'foo' found in replica set configuration"
     operations:
-      -
-        name: withTransaction
-        object: session0
-        arguments: *arguments
+      - <<: *operation
         result:
           errorCodeName: UnknownReplWriteConcern
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
-    expectations:
+    expectations: &expectations_without_retries
       -
         command_started_event:
           command:
@@ -213,7 +171,9 @@ tests:
             writeConcern: ~
           command_name: commitTransaction
           database_name: admin
+    # failCommand with writeConcernError still applies the write operation(s)
     outcome: *outcome
+
   -
     description: commitTransaction is not retried after UnsatisfiableWriteConcern error
     failPoint:
@@ -226,41 +186,31 @@ tests:
             codeName: UnsatisfiableWriteConcern
             errmsg: "Not enough data-bearing nodes"
     operations:
-      -
-        name: withTransaction
-        object: session0
-        arguments: *arguments
+      - <<: *operation
         result:
           errorCodeName: UnsatisfiableWriteConcern
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
-    expectations:
-      -
-        command_started_event:
-          command:
-            insert: *collection_name
-            documents:
-              - { _id: 1 }
-            ordered: true
-            lsid: session0
-            txnNumber: { $numberLong: "1" }
-            startTransaction: true
-            autocommit: false
-            # omitted fields
-            readConcern: ~
-            writeConcern: ~
-          command_name: insert
-          database_name: *database_name
-      -
-        command_started_event:
-          command:
-            commitTransaction: 1
-            lsid: session0
-            txnNumber: { $numberLong: "1" }
-            autocommit: false
-            # omitted fields
-            readConcern: ~
-            startTransaction: ~
-            writeConcern: ~
-          command_name: commitTransaction
-          database_name: admin
+    expectations: *expectations_without_retries
+    # failCommand with writeConcernError still applies the write operation(s)
+    outcome: *outcome
+
+  -
+    description: commitTransaction is not retried after MaxTimeMSExpired error
+    failPoint:
+      configureFailPoint: failCommand
+      mode: { times: 1 }
+      data:
+          failCommands: ["commitTransaction"]
+          writeConcernError:
+            code: 50
+            codeName: MaxTimeMSExpired
+            errmsg: "operation exceeded time limit"
+    operations:
+      - <<: *operation
+        result:
+          errorCodeName: MaxTimeMSExpired
+          errorLabelsContain: ["UnknownTransactionCommitResult"]
+          errorLabelsOmit: ["TransientTransactionError"]
+    expectations: *expectations_without_retries
+    # failCommand with writeConcernError still applies the write operation(s)
     outcome: *outcome