mongo 2.12.4 → 2.13.0.beta1

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

@@ -19,6 +19,7 @@ tests:
             data:
                 failCommands: ["findAndModify"]
                 errorCode: 189
+                errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndDelete"
             arguments:
@@ -39,6 +40,7 @@ tests:
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndDelete"
             arguments:
@@ -49,3 +51,24 @@ tests:
             collection:
                 data:
                     - { _id: 2, x: 22 }
+    -
+        description: "FindOneAndDelete fails with a RetryableWriteError label after two connection failures"
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+                failCommands: ["findAndModify"]
+                closeConnection: true
+        operation:
+            name: "findOneAndDelete"
+            arguments:
+                filter: { x: { $gte: 11 } }
+                sort: { x: 1 }
+        outcome:
+            error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }
+                    - { _id: 2, x: 22 }

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

@@ -0,0 +1,52 @@
+runOn:
+    - minServerVersion: "4.3.1"
+      topology: ["replicaset", "sharded"]
+
+data:
+    - { _id: 1, x: 11 }
+    - { _id: 2, x: 22 }
+
+tests:
+    - description: "FindOneAndReplace succeeds with RetryableWriteError from server"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["findAndModify"]
+              errorCode: 112 # WriteConflict, not a retryable error code
+              errorLabels: ["RetryableWriteError"] # Override server behavior: send RetryableWriteError label with non-retryable error code
+      operation:
+          name: "findOneAndReplace"
+          arguments:
+              filter: { _id: 1 }
+              replacement: { _id: 1, x: 111 }
+              returnDocument: "Before"
+      outcome: # Driver retries operation and it succeeds
+          result: { _id: 1, x: 11 }
+          collection:
+              data:
+                  - { _id: 1, x: 111 }
+                  - { _id: 2, x: 22 }
+
+    - description: "FindOneAndReplace fails if server does not return RetryableWriteError"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["findAndModify"]
+              errorCode: 11600 # InterruptedAtShutdown, normally a retryable error code
+              errorLabels: []  # Override server behavior: do not send RetryableWriteError label with retryable code
+      operation:
+          name: "findOneAndReplace"
+          arguments:
+              filter: { _id: 1 }
+              replacement: { _id: 1, x: 111 }
+              returnDocument: "Before"
+      outcome:
+          error: true # Driver does not retry operation because there was no RetryableWriteError label on response
+          result:
+              errorLabelsOmit: ["RetryableWriteError"]
+          collection:
+              data:
+                  - { _id: 1, x: 11 }
+                  - { _id: 2, x: 22 }

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

@@ -19,6 +19,7 @@ tests:
             data:
                 failCommands: ["findAndModify"]
                 errorCode: 189
+                errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndReplace"
             arguments:
@@ -41,6 +42,7 @@ tests:
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndReplace"
             arguments:
@@ -53,3 +55,26 @@ tests:
                 data:
                     - { _id: 1, x: 111 }
                     - { _id: 2, x: 22 }
+
+    -
+        description: "FindOneAndReplace fails with a RetryableWriteError label after two connection failures"
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+                failCommands: ["findAndModify"]
+                closeConnection: true
+        operation:
+            name: "findOneAndReplace"
+            arguments:
+                filter: { _id: 1 }
+                replacement: { _id: 1, x: 111 }
+                returnDocument: "Before"
+        outcome:
+            error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }
+                    - { _id: 2, x: 22 }

data/spec/spec_tests/data/retryable_writes/findOneAndUpdate-errorLabels.yml

@@ -0,0 +1,52 @@
+runOn:
+    - minServerVersion: "4.3.1"
+      topology: ["replicaset", "sharded"]
+
+data:
+    - { _id: 1, x: 11 }
+    - { _id: 2, x: 22 }
+
+tests:
+    - description: "FindOneAndUpdate succeeds with RetryableWriteError from server"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["findAndModify"]
+              errorCode: 112 # WriteConflict, not a retryable error code
+              errorLabels: ["RetryableWriteError"] # Override server behavior: send RetryableWriteError label with non-retryable error code
+      operation:
+          name: "findOneAndUpdate"
+          arguments:
+              filter: { _id: 1 }
+              update: { $inc: { x: 1 } }
+              returnDocument: "Before"
+      outcome: # Driver retries operation and it succeeds
+          result: { _id: 1, x: 11 }
+          collection:
+              data:
+                  - { _id: 1, x: 12 }
+                  - { _id: 2, x: 22 }
+
+    - description: "FindOneAndUpdate fails if server does not return RetryableWriteError"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["findAndModify"]
+              errorCode: 11600 # InterruptedAtShutdown, normally a retryable error code
+              errorLabels: []  # Override server behavior: do not send RetryableWriteError label with retryable code
+      operation:
+          name: "findOneAndUpdate"
+          arguments:
+              filter: { _id: 1 }
+              update: { $inc: { x: 1 } }
+              returnDocument: "Before"
+      outcome:
+          error: true # Driver does not retry operation because there was no RetryableWriteError label on response
+          result:
+              errorLabelsOmit: ["RetryableWriteError"]
+          collection:
+              data:
+                  - { _id: 1, x: 11 }
+                  - { _id: 2, x: 22 }

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

@@ -19,6 +19,7 @@ tests:
             data:
                 failCommands: ["findAndModify"]
                 errorCode: 189
+                errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndUpdate"
             arguments:
@@ -41,6 +42,7 @@ tests:
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "findOneAndUpdate"
             arguments:
@@ -53,3 +55,25 @@ tests:
                 data:
                     - { _id: 1, x: 12 }
                     - { _id: 2, x: 22 }
+    -
+        description: "FindOneAndUpdate fails with a RetryableWriteError label after two connection failures"
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+                failCommands: ["findAndModify"]
+                closeConnection: true
+        operation:
+            name: "findOneAndUpdate"
+            arguments:
+                filter: { _id: 1 }
+                update: { $inc: { x: 1 } }
+                returnDocument: "Before"
+        outcome:
+            error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }
+                    - { _id: 2, x: 22 }

data/spec/spec_tests/data/retryable_writes/insertMany-errorLabels.yml

@@ -0,0 +1,54 @@
+runOn:
+    - minServerVersion: "4.3.1"
+      topology: ["replicaset", "sharded"]
+
+data:
+    - { _id: 1, x: 11 }
+
+tests:
+    - description: "InsertMany succeeds with RetryableWriteError from server"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["insert"]
+              errorCode: 112 # WriteConflict, not a retryable error code
+              errorLabels: ["RetryableWriteError"] # Override server behavior: send RetryableWriteError label with non-retryable error code
+      operation:
+          name: "insertMany"
+          arguments:
+              documents:
+                  - { _id: 2, x: 22 }
+                  - { _id: 3, x: 33 }
+              options: { ordered: true }
+      outcome: # Driver retries operation and it succeeds
+          result:
+              insertedIds: { 0: 2, 1: 3 }
+          collection:
+              data:
+                  - { _id: 1, x: 11 }
+                  - { _id: 2, x: 22 }
+                  - { _id: 3, x: 33 }
+
+    - description: "InsertMany fails if server does not return RetryableWriteError"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["insert"]
+              errorCode: 11600 # InterruptedAtShutdown, normally a retryable error code
+              errorLabels: []  # Override server behavior: do not send RetryableWriteError label with retryable code
+      operation:
+          name: "insertMany"
+          arguments:
+              documents:
+                  - { _id: 2, x: 22 }
+                  - { _id: 3, x: 33 }
+              options: { ordered: true }
+      outcome:
+          error: true # Driver does not retry operation because there was no RetryableWriteError label on response
+          result:
+              errorLabelsOmit: ["RetryableWriteError"]
+          collection:
+              data:
+                  - { _id: 1, x: 11 }

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

@@ -18,6 +18,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 189
+                errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertMany"
             arguments:
@@ -43,6 +44,7 @@ tests:
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertMany"
             arguments:
@@ -58,3 +60,25 @@ tests:
                     - { _id: 1, x: 11 }
                     - { _id: 2, x: 22 }
                     - { _id: 3, x: 33 }
+    -
+        description: "InsertMany fails with a RetryableWriteError label after two connection failures"
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+                failCommands: ["insert"]
+                closeConnection: true
+        operation:
+            name: "insertMany"
+            arguments:
+                documents:
+                    - { _id: 2, x: 22 }
+                    - { _id: 3, x: 33 }
+                options: { ordered: true }
+        outcome:
+            error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }

data/spec/spec_tests/data/retryable_writes/insertOne-errorLabels.yml

@@ -0,0 +1,44 @@
+runOn:
+    - minServerVersion: "4.3.1"
+      topology: ["replicaset", "sharded"]
+
+data: []
+
+tests:
+    - description: "InsertOne succeeds with RetryableWriteError from server"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["insert"]
+              errorCode: 112 # WriteConflict, not a retryable error code
+              errorLabels: ["RetryableWriteError"] # Override server behavior: send RetryableWriteError label with non-retryable error code
+      operation:
+          name: "insertOne"
+          arguments:
+              document: { _id: 1, x: 11 }
+      outcome: # Driver retries operation and it succeeds
+          result:
+              insertedId: 1
+          collection:
+              data:
+                  - { _id: 1, x: 11 }
+
+    - description: "InsertOne fails if server does not return RetryableWriteError"
+      failPoint:
+          configureFailPoint: failCommand
+          mode: { times: 1 }
+          data:
+              failCommands: ["insert"]
+              errorCode: 11600 # InterruptedAtShutdown, normally a retryable error code
+              errorLabels: []  # Override server behavior: do not send RetryableWriteError label with retryable code
+      operation:
+          name: "insertOne"
+          arguments:
+              document: { _id: 1, x: 11 }
+      outcome:
+          error: true # Driver does not retry operation because there was no RetryableWriteError label on response
+          result:
+              errorLabelsOmit: ["RetryableWriteError"]
+          collection:
+              data: []

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

@@ -31,6 +31,30 @@ tests:
                     - { _id: 1, x: 11 }
                     - { _id: 2, x: 22 }
                     - { _id: 3, x: 33 }
+    -
+        description: "InsertOne fails after connection failure when retryWrites option is false"
+        clientOptions:
+            retryWrites: false
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: ["insert"]
+                closeConnection: true
+        operation:
+            name: "insertOne"
+            arguments:
+                document: { _id: 3, x: 33 }
+        outcome:
+            error: true
+            result:
+                # If retryWrites is false, the driver should not add the
+                # RetryableWriteError label to the error.
+                errorLabelsOmit: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }
+                    - { _id: 2, x: 22 }
     -
         description: "InsertOne succeeds after NotMaster"
         failPoint:
@@ -39,6 +63,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 10107
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -60,6 +85,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 13436
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -81,6 +107,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 13435
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -102,6 +129,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 11602
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -123,6 +151,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 11600
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -144,6 +173,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 189
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -165,6 +195,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 91
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -186,6 +217,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 7
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -207,6 +239,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 6
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -228,6 +261,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 9001
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -249,6 +283,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 89
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -270,6 +305,7 @@ tests:
             data:
                 failCommands: ["insert"]
                 errorCode: 262
+                errorLabels: ["RetryableWriteError"]
                 closeConnection: false
         operation:
             name: "insertOne"
@@ -298,6 +334,8 @@ tests:
                 document: { _id: 3, x: 33 }
         outcome:
             error: true
+            result:
+                errorLabelsOmit: ["RetryableWriteError"]
             collection:
                 data:
                     - { _id: 1, x: 11 }
@@ -312,6 +350,7 @@ tests:
                 writeConcernError:
                     code: 11600
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertOne"
             arguments:
@@ -334,6 +373,7 @@ tests:
                 writeConcernError:
                     code: 11602
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertOne"
             arguments:
@@ -356,6 +396,7 @@ tests:
                 writeConcernError:
                     code: 189
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertOne"
             arguments:
@@ -378,6 +419,7 @@ tests:
                 writeConcernError:
                     code: 91
                     errmsg: Replication is being shut down
+                    errorLabels: ["RetryableWriteError"]
         operation:
             name: "insertOne"
             arguments:
@@ -406,6 +448,8 @@ tests:
                 document: { _id: 3, x: 33 }
         outcome:
             error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
             collection:
                 data:
                     - { _id: 1, x: 11 }
@@ -427,6 +471,8 @@ tests:
                 document: { _id: 3, x: 33 }
         outcome:
             error: true
+            result:
+                errorLabelsOmit: ["RetryableWriteError"]
             collection:
                 data:
                     - { _id: 1, x: 11 }
@@ -450,8 +496,31 @@ tests:
                 document: { _id: 3, x: 33 }
         outcome:
             error: true
+            result:
+                errorLabelsOmit: ["RetryableWriteError"]
             collection:
                 data:
                     - { _id: 1, x: 11 }
                     - { _id: 2, x: 22 }
                     - { _id: 3, x: 33 }  # The write was still applied.
+
+    -
+        description: "InsertOne fails with a RetryableWriteError label after two connection failures"
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 2 }
+            data:
+                failCommands: ["insert"]
+                closeConnection: true
+        operation:
+            name: "insertOne"
+            arguments:
+                document: { _id: 3, x: 33 }
+        outcome:
+            error: true
+            result:
+                errorLabelsContain: ["RetryableWriteError"]
+            collection:
+                data:
+                    - { _id: 1, x: 11 }
+                    - { _id: 2, x: 22 }