mongo 2.8.0 → 2.9.0.rc0

data/spec/spec_tests/data/retryable_writes/bulkWrite-serverErrors.yml

@@ -1,15 +1,18 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-# TODO: this should change to 4.0 once 4.0.0 is released.
-minServerVersion: '3.99'
-
 tests:
     -
         description: "BulkWrite succeeds after PrimarySteppedDown"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -37,6 +40,7 @@ tests:
         outcome:
             result:
                 deletedCount: 1
+                insertedCount: 1
                 insertedIds: { 1: 3 }
                 matchedCount: 1
                 modifiedCount: 1
@@ -48,8 +52,6 @@ tests:
                     - { _id: 3, x: 33 }
     -
         description: "BulkWrite succeeds after WriteConcernError ShutdownInProgress"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -79,6 +81,7 @@ tests:
         outcome:
             result:
                 deletedCount: 1
+                insertedCount: 1
                 insertedIds: { 1: 3 }
                 matchedCount: 1
                 modifiedCount: 1

data/spec/spec_tests/data/retryable_writes/bulkWrite.yml

@@ -1,13 +1,14 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset"]
+
 data:
     - { _id: 1, x: 11 }
 
-minServerVersion: '3.6'
-
 tests:
     -
         description: "First command is retried"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -32,6 +33,7 @@ tests:
         outcome:
             result:
                 deletedCount: 1
+                insertedCount: 1
                 insertedIds: { 0: 2 }
                 matchedCount: 1
                 modifiedCount: 1
@@ -45,8 +47,6 @@ tests:
         # that each write command consists of a single statement, which will
         # fail on the first attempt and succeed on the second, retry attempt.
         description: "All commands are retried"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 7 }
@@ -90,6 +90,7 @@ tests:
         outcome:
             result:
                 deletedCount: 1
+                insertedCount: 3
                 insertedIds: { 0: 2, 2: 3, 4: 5 }
                 matchedCount: 2
                 modifiedCount: 2
@@ -103,8 +104,6 @@ tests:
                     - { _id: 5, x: 55 }
     -
         description: "Both commands are retried after their first statement fails"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
@@ -130,6 +129,7 @@ tests:
         outcome:
             result:
                 deletedCount: 0
+                insertedCount: 1
                 insertedIds: { 0: 2 }
                 matchedCount: 2
                 modifiedCount: 2
@@ -141,8 +141,6 @@ tests:
                     - { _id: 2, x: 23 }
     -
         description: "Second command is retried after its second statement fails"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 2 }
@@ -168,6 +166,7 @@ tests:
         outcome:
             result:
                 deletedCount: 0
+                insertedCount: 1
                 insertedIds: { 0: 2 }
                 matchedCount: 2
                 modifiedCount: 2
@@ -179,8 +178,6 @@ tests:
                     - { _id: 2, x: 23 }
     -
         description: "BulkWrite with unordered execution"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -200,6 +197,7 @@ tests:
         outcome:
             result:
                 deletedCount: 0
+                insertedCount: 2
                 insertedIds: { 0: 2, 1: 3 }
                 matchedCount: 0
                 modifiedCount: 0
@@ -212,8 +210,6 @@ tests:
                     - { _id: 3, x: 33 }
     -
         description: "First insertOne is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
@@ -240,6 +236,7 @@ tests:
             error: true
             result:
                 deletedCount: 0
+                insertedCount: 0
                 insertedIds: { }
                 matchedCount: 0
                 modifiedCount: 0
@@ -250,8 +247,6 @@ tests:
                     - { _id: 1, x: 11 }
     -
         description: "Second updateOne is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 1 }
@@ -278,6 +273,7 @@ tests:
             error: true
             result:
                 deletedCount: 0
+                insertedCount: 1
                 insertedIds: { 0: 2 }
                 matchedCount: 0
                 modifiedCount: 0
@@ -289,8 +285,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "Third updateOne is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 2 }
@@ -318,6 +312,7 @@ tests:
             error: true
             result:
                 deletedCount: 0
+                insertedCount: 1
                 insertedIds: { 1: 2 }
                 matchedCount: 1
                 modifiedCount: 1
@@ -333,8 +328,6 @@ tests:
         # affect the initial deleteMany and will trigger once (and only once)
         # for the first insertOne attempt.
         description: "Single-document write following deleteMany is retried"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -355,6 +348,7 @@ tests:
         outcome:
             result:
                 deletedCount: 1
+                insertedCount: 1
                 insertedIds: { 1: 2 }
                 matchedCount: 0
                 modifiedCount: 0
@@ -369,8 +363,6 @@ tests:
         # affect the initial updateMany and will trigger once (and only once)
         # for the first insertOne attempt.
         description: "Single-document write following updateMany is retried"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -392,6 +384,7 @@ tests:
         outcome:
             result:
                 deletedCount: 0
+                insertedCount: 1
                 insertedIds: { 1: 2 }
                 matchedCount: 1
                 modifiedCount: 1

data/spec/spec_tests/data/retryable_writes/deleteMany.yml

@@ -0,0 +1,22 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset", "sharded"]
+
+data:
+    - { _id: 1, x: 11 }
+    - { _id: 2, x: 22 }
+
+tests:
+    -
+        description: "DeleteMany ignores retryWrites"
+        useMultipleMongoses: true
+        operation:
+            name: "deleteMany"
+            arguments:
+                filter: { }
+        outcome:
+            result:
+                deletedCount: 2
+            collection:
+                data: []

data/spec/spec_tests/data/retryable_writes/deleteOne-serverErrors.yml

@@ -1,15 +1,18 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-# TODO: this should change to 4.0 once 4.0.0 is released.
-minServerVersion: '3.99'
-
 tests:
     -
         description: "DeleteOne succeeds after PrimarySteppedDown"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -28,8 +31,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "DeleteOne succeeds after WriteConcernError ShutdownInProgress"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }

data/spec/spec_tests/data/retryable_writes/deleteOne.yml

@@ -1,14 +1,15 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-minServerVersion: '3.6'
-
 tests:
     -
         description: "DeleteOne is committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -24,8 +25,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "DeleteOne is not committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -42,8 +41,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "DeleteOne is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }

data/spec/spec_tests/data/retryable_writes/findOneAndDelete-serverErrors.yml

@@ -1,15 +1,18 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-# TODO: this should change to 4.0 once 4.0.0 is released.
-minServerVersion: '3.99'
-
 tests:
     -
         description: "FindOneAndDelete succeeds after PrimarySteppedDown"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -28,8 +31,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndDelete succeeds after WriteConcernError ShutdownInProgress"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }

data/spec/spec_tests/data/retryable_writes/findOneAndDelete.yml

@@ -1,14 +1,15 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-minServerVersion: '3.6'
-
 tests:
     -
         description: "FindOneAndDelete is committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -24,8 +25,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndDelete is not committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -42,8 +41,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndDelete is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }

data/spec/spec_tests/data/retryable_writes/findOneAndReplace-serverErrors.yml

@@ -1,15 +1,18 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-# TODO: this should change to 4.0 once 4.0.0 is released.
-minServerVersion: '3.99'
-
 tests:
     -
         description: "FindOneAndReplace succeeds after PrimarySteppedDown"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -30,8 +33,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndReplace succeeds after WriteConcernError ShutdownInProgress"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }

data/spec/spec_tests/data/retryable_writes/findOneAndReplace.yml

@@ -1,14 +1,15 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-minServerVersion: '3.6'
-
 tests:
     -
         description: "FindOneAndReplace is committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -26,8 +27,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndReplace is not committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -46,8 +45,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "FindOneAndReplace is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }