mongo 2.7.0 → 2.7.1

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

@@ -16,18 +16,19 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              # We do not assert the result here, as insertOne will fail for the
-              # first two executions of the callback before ultimately
-              # succeeding and returning a result. Asserting the state of the
-              # output collection after the test is sufficient.
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
+        arguments:
+          callback:
+            operations:
+              -
+                # We do not assert the result here, as insertOne will fail for
+                # the first two executions of the callback before ultimately
+                # succeeding and returning a result. Asserting the state of the
+                # output collection after the test is sufficient.
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
     expectations:
       -
         command_started_event:
@@ -130,25 +131,26 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                errorCodeName: DuplicateKey
-                errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  errorCodeName: DuplicateKey
+                  errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
         result:
           errorCodeName: DuplicateKey
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]

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

@@ -6,7 +6,6 @@ data: []
 tests:
   -
     description: commitTransaction succeeds after multiple connection errors
-    skipReason: SPEC-1185 Drivers should use majority write concern when retrying commitTransaction
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 2 }
@@ -17,16 +16,17 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
     expectations:
       -
         command_started_event:
@@ -65,7 +65,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             autocommit: false
             # commitTransaction applies w:majority on retries (SPEC-1185)
-            writeConcern: { w: majority }
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
@@ -79,7 +79,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             autocommit: false
             # commitTransaction applies w:majority on retries (SPEC-1185)
-            writeConcern: { w: majority }
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
@@ -91,7 +91,6 @@ tests:
           - { _id: 1 }
   -
     description: commitTransaction retry only overwrites write concern w option
-    skipReason: SPEC-1185 Drivers should use majority write concern when retrying commitTransaction
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 2 }
@@ -102,18 +101,19 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
-        transactionOptions:
-          writeConcern: { w: 2, j: true, wtimeout: 5000 }
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
+          options:
+            writeConcern: { w: 2, j: true, wtimeout: 5000 }
     expectations:
       -
         command_started_event:
@@ -189,16 +189,17 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
     expectations:
       -
         command_started_event:
@@ -236,10 +237,11 @@ tests:
             lsid: session0
             txnNumber: { $numberLong: "1" }
             autocommit: false
+            # commitTransaction applies w:majority on retries (SPEC-1185)
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
-            writeConcern: ~
           command_name: commitTransaction
           database_name: admin
       -
@@ -249,13 +251,14 @@ tests:
             lsid: session0
             txnNumber: { $numberLong: "1" }
             autocommit: false
+            # commitTransaction applies w:majority on retries (SPEC-1185)
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
-            writeConcern: ~
           command_name: commitTransaction
           database_name: admin
-    outcome: &outcome
+    outcome:
       collection:
         data:
           - { _id: 1 }

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

@@ -24,17 +24,18 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback: &callback
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
-    expectations: &expectations
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
+    expectations:
       -
         command_started_event:
           command:
@@ -126,7 +127,7 @@ tests:
             writeConcern: ~
           command_name: commitTransaction
           database_name: admin
-    outcome: &outcome
+    outcome:
       collection:
         data:
           - { _id: 1 }

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

@@ -18,20 +18,21 @@ tests:
           failCommands: ["commitTransaction"]
           errorCode: 24 # LockTimeout
           closeConnection: false
-    operations:
+    operations: &operations
       -
         name: withTransaction
         object: session0
-        callback: &callback
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
+        arguments:
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
     expectations: &expectations
       -
         command_started_event:
@@ -137,11 +138,7 @@ tests:
           failCommands: ["commitTransaction"]
           errorCode: 112 # WriteConflict
           closeConnection: false
-    operations:
-      -
-        name: withTransaction
-        object: session0
-        callback: *callback
+    operations: *operations
     expectations: *expectations
     outcome: *outcome
   -
@@ -153,11 +150,7 @@ tests:
           failCommands: ["commitTransaction"]
           errorCode: 246 # SnapshotUnavailable
           closeConnection: false
-    operations:
-      -
-        name: withTransaction
-        object: session0
-        callback: *callback
+    operations: *operations
     expectations: *expectations
     outcome: *outcome
   -
@@ -169,10 +162,6 @@ tests:
           failCommands: ["commitTransaction"]
           errorCode: 251 # NoSuchTransaction
           closeConnection: false
-    operations:
-      -
-        name: withTransaction
-        object: session0
-        callback: *callback
+    operations: *operations
     expectations: *expectations
     outcome: *outcome

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

@@ -6,14 +6,13 @@ data: []
 tests:
   -
     description: commitTransaction is not retried after WriteConcernFailed timeout error
-    skipReason: SPEC-1197 Drivers should not retry commit after wtimeout error
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
           failCommands: ["commitTransaction"]
           # Do not specify closeConnection: false, since that would conflict
-          # with writeConcernError (likely a server bug)
+          # with writeConcernError (see: SERVER-39292)
           writeConcernError:
             code: 64
             codeName: WriteConcernFailed
@@ -23,20 +22,22 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback: &callback
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
+        arguments: &arguments
+          callback:
+            operations:
+              -
+                name: insertOne
+                object: collection
+                arguments:
+                  session: session0
+                  document: { _id: 1 }
+                result:
+                  insertedId: 1
         result:
           errorCodeName: WriteConcernFailed
           # Per transactions spec, drivers add UnknownTransactionCommitResult
-          # label for WriteConcernFailed errors
+          # label for WriteConcernFailed errors; however, neither the driver
+          # nor withTransaction() will retry the commit in this case.
           errorLabelsContain: ["UnknownTransactionCommitResult"]
           errorLabelsOmit: ["TransientTransactionError"]
     expectations:
@@ -75,36 +76,27 @@ tests:
         data:
           - { _id: 1 }
   -
-    # This test configures the fail point to return a contrived error that
-    # is WriteConcernFailed but omits the errInfo field that would identify it
-    # as a wtimeout error. This tests that drivers do not assume that all
+    # 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
-    skipReason: SPEC-1185 Drivers should use majority write concern when retrying commitTransaction
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 2 }
       data:
           failCommands: ["commitTransaction"]
-          closeConnection: false
+          # Do not specify closeConnection: false, since that would conflict
+          # with writeConcernError (see: SERVER-39292)
           writeConcernError:
             code: 64
             codeName: WriteConcernFailed
-            errmsg: "waiting for replication did not time out"
+            errmsg: "multiple errors reported"
     operations:
       -
         name: withTransaction
         object: session0
-        callback:
-          operations:
-            -
-              name: insertOne
-              object: collection
-              arguments:
-                session: session0
-                document: { _id: 1 }
-              result:
-                insertedId: 1
+        arguments: *arguments
     expectations:
       -
         command_started_event:
@@ -143,7 +135,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             autocommit: false
             # commitTransaction applies w:majority on retries (SPEC-1185)
-            writeConcern: { w: majority }
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
@@ -157,7 +149,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             autocommit: false
             # commitTransaction applies w:majority on retries (SPEC-1185)
-            writeConcern: { w: majority }
+            writeConcern: { w: majority, wtimeout: 10000 }
             # omitted fields
             readConcern: ~
             startTransaction: ~
@@ -182,7 +174,7 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback: *callback
+        arguments: *arguments
         result:
           errorCodeName: UnknownReplWriteConcern
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
@@ -232,7 +224,7 @@ tests:
       -
         name: withTransaction
         object: session0
-        callback: *callback
+        arguments: *arguments
         result:
           errorCodeName: UnsatisfiableWriteConcern
           errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]