mongo 2.5.3 → 2.6.0

data/spec/support/gridfs.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 MongoDB, Inc.
+# Copyright (C) 2014-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/support/primary_socket.rb

@@ -0,0 +1,21 @@
+module PrimarySocket
+  def self.included(base)
+    base.class_eval do
+
+      let(:primary_server) do
+        client.cluster.next_primary
+      end
+
+      let(:primary_connection) do
+        connection = primary_server.pool.checkout
+        connection.connect!
+        primary_server.pool.checkin(connection)
+        connection
+      end
+
+      let(:primary_socket) do
+        primary_connection.send(:socket)
+      end
+    end
+  end
+end

data/spec/support/retryable_writes_tests/bulkWrite-serverErrors.yml

@@ -0,0 +1,90 @@
+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 }
+            data:
+                failCommands: ["update"]
+                errorCode: 189
+        operation:
+            name: "bulkWrite"
+            arguments:
+                requests:
+                    -
+                        name: "deleteOne"
+                        arguments:
+                            filter: { _id: 1 }
+                    -
+                        name: "insertOne"
+                        arguments:
+                            document: { _id: 3, x: 33 }
+                    -
+                        name: "updateOne"
+                        arguments:
+                            filter: { _id: 2 }
+                            update: { $inc: { x : 1 }}
+                options: { ordered: true }
+        outcome:
+            result:
+                deletedCount: 1
+                insertedIds: { 1: 3 }
+                matchedCount: 1
+                modifiedCount: 1
+                upsertedCount: 0
+                upsertedIds: { }
+            collection:
+                data:
+                    - { _id: 2, x: 23 }
+                    - { _id: 3, x: 33 }
+    -
+        description: "BulkWrite succeeds after WriteConcernError ShutdownInProgress"
+        clientOptions:
+            retryWrites: true
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: ["insert"]
+                writeConcernError:
+                    code: 91
+                    errmsg: Replication is being shut down
+        operation:
+            name: "bulkWrite"
+            arguments:
+                requests:
+                    -
+                        name: "deleteOne"
+                        arguments:
+                            filter: { _id: 1 }
+                    -
+                        name: "insertOne"
+                        arguments:
+                            document: { _id: 3, x: 33 }
+                    -
+                        name: "updateOne"
+                        arguments:
+                            filter: { _id: 2 }
+                            update: { $inc: { x : 1 }}
+                options: { ordered: true }
+        outcome:
+            result:
+                deletedCount: 1
+                insertedIds: { 1: 3 }
+                matchedCount: 1
+                modifiedCount: 1
+                upsertedCount: 0
+                upsertedIds: { }
+            collection:
+                data:
+                    - { _id: 2, x: 23 }
+                    - { _id: 3, x: 33 }

data/spec/support/retryable_writes_tests/bulkWrite.yml

@@ -6,7 +6,10 @@ minServerVersion: '3.6'
 tests:
     -
         description: "First command is retried"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
         operation:
             name: "bulkWrite"
@@ -42,7 +45,10 @@ 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 }
         operation:
             name: "bulkWrite"
@@ -97,7 +103,10 @@ tests:
                     - { _id: 5, x: 55 }
     -
         description: "Both commands are retried after their first statement fails"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
         operation:
             name: "bulkWrite"
@@ -132,7 +141,10 @@ tests:
                     - { _id: 2, x: 23 }
     -
         description: "Second command is retried after its second statement fails"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 2 }
         operation:
             name: "bulkWrite"
@@ -167,7 +179,10 @@ tests:
                     - { _id: 2, x: 23 }
     -
         description: "BulkWrite with unordered execution"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
         operation:
             name: "bulkWrite"
@@ -197,7 +212,10 @@ tests:
                     - { _id: 3, x: 33 }
     -
         description: "First insertOne is never committed"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -232,7 +250,10 @@ tests:
                     - { _id: 1, x: 11 }
     -
         description: "Second updateOne is never committed"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 1 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -268,7 +289,10 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "Third updateOne is never committed"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { skip: 2 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -294,7 +318,81 @@ tests:
             error: true
             result:
                 deletedCount: 0
-                insertedIds: { 0: 2 }
+                insertedIds: { 1: 2 }
+                matchedCount: 1
+                modifiedCount: 1
+                upsertedCount: 0
+                upsertedIds: { }
+            collection:
+                data:
+                    - { _id: 1, x: 12 }
+                    - { _id: 2, x: 22 }
+    -
+        # The onPrimaryTransactionalWrite fail point only triggers for write
+        # operations that include a transaction ID. Therefore, it will not
+        # 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 }
+            data: { failBeforeCommitExceptionCode: 1 }
+        operation:
+            name: "bulkWrite"
+            arguments:
+                requests:
+                    -
+                        name: "deleteMany"
+                        arguments:
+                            filter: { x: 11 }
+                    -
+                        name: "insertOne"
+                        arguments:
+                            document: { _id: 2, x: 22 }
+                options: { ordered: true }
+        outcome:
+            result:
+                deletedCount: 1
+                insertedIds: { 1: 2 }
+                matchedCount: 0
+                modifiedCount: 0
+                upsertedCount: 0
+                upsertedIds: { }
+            collection:
+                data:
+                    - { _id: 2, x: 22 }
+    -
+        # The onPrimaryTransactionalWrite fail point only triggers for write
+        # operations that include a transaction ID. Therefore, it will not
+        # 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 }
+            data: { failBeforeCommitExceptionCode: 1 }
+        operation:
+            name: "bulkWrite"
+            arguments:
+                requests:
+                    -
+                        name: "updateMany"
+                        arguments:
+                            filter: { x: 11 }
+                            update: { $inc: { x : 1 }}
+                    -
+                        name: "insertOne"
+                        arguments:
+                            document: { _id: 2, x: 22 }
+                options: { ordered: true }
+        outcome:
+            result:
+                deletedCount: 0
+                insertedIds: { 1: 2 }
                 matchedCount: 1
                 modifiedCount: 1
                 upsertedCount: 0

data/spec/support/retryable_writes_tests/deleteOne-serverErrors.yml

@@ -0,0 +1,50 @@
+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 }
+            data:
+                failCommands: ["delete"]
+                errorCode: 189
+        operation:
+            name: "deleteOne"
+            arguments:
+                filter: { _id: 1 }
+        outcome:
+            result:
+                deletedCount: 1
+            collection:
+                data:
+                    - { _id: 2, x: 22 }
+    -
+        description: "DeleteOne succeeds after WriteConcernError ShutdownInProgress"
+        clientOptions:
+            retryWrites: true
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: ["delete"]
+                writeConcernError:
+                    code: 91
+                    errmsg: Replication is being shut down
+        operation:
+            name: "deleteOne"
+            arguments:
+                filter: { _id: 1 }
+        outcome:
+            result:
+                deletedCount: 1
+            collection:
+                data:
+                    - { _id: 2, x: 22 }

data/spec/support/retryable_writes_tests/deleteOne.yml

@@ -7,7 +7,10 @@ minServerVersion: '3.6'
 tests:
     -
         description: "DeleteOne is committed on first attempt"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
         operation:
             name: "deleteOne"
@@ -21,7 +24,10 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "DeleteOne is not committed on first attempt"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -36,7 +42,10 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "DeleteOne is never committed"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -48,4 +57,4 @@ tests:
             collection:
                 data:
                     - { _id: 1, x: 11 }
-                    - { _id: 2, x: 22 }
+                    - { _id: 2, x: 22 }

data/spec/support/retryable_writes_tests/findOneAndDelete-serverErrors.yml

@@ -0,0 +1,50 @@
+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 }
+            data:
+                failCommands: ["findAndModify"]
+                errorCode: 189
+        operation:
+            name: "findOneAndDelete"
+            arguments:
+                filter: { x: { $gte: 11 }}
+                sort: { x: 1 }
+        outcome:
+            result: { _id: 1, x: 11 }
+            collection:
+                data:
+                    - { _id: 2, x: 22 }
+    -
+        description: "FindOneAndDelete succeeds after WriteConcernError ShutdownInProgress"
+        clientOptions:
+            retryWrites: true
+        failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: ["findAndModify"]
+                writeConcernError:
+                    code: 91
+                    errmsg: Replication is being shut down
+        operation:
+            name: "findOneAndDelete"
+            arguments:
+                filter: { x: { $gte: 11 }}
+                sort: { x: 1 }
+        outcome:
+            result: { _id: 1, x: 11 }
+            collection:
+                data:
+                    - { _id: 2, x: 22 }

data/spec/support/retryable_writes_tests/findOneAndDelete.yml

@@ -5,38 +5,47 @@ data:
 minServerVersion: '3.6'
 
 tests:
-#    -
-#        description: "FindOneAndDelete is committed on first attempt"
-#        failPoint:
-#            mode: { times: 1 }
-#        operation:
-#            name: "findOneAndDelete"
-#            arguments:
-#                filter: { x: { $gte: 11 }}
-#                sort: { x: 1 }
-#        outcome:
-#            result: { _id: 1, x: 11 }
-#            collection:
-#                data:
-#                    - { _id: 2, x: 22 }
-#    -
-#        description: "FindOneAndDelete is not committed on first attempt"
-#        failPoint:
-#            mode: { times: 1 }
-#            data: { failBeforeCommitExceptionCode: 1 }
-#        operation:
-#            name: "findOneAndDelete"
-#            arguments:
-#                filter: { x: { $gte: 11 }}
-#                sort: { x: 1 }
-#        outcome:
-#            result: { _id: 1, x: 11 }
-#            collection:
-#                data:
-#                    - { _id: 2, x: 22 }
+    -
+        description: "FindOneAndDelete is committed on first attempt"
+        clientOptions:
+            retryWrites: true
+        failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
+            mode: { times: 1 }
+        operation:
+            name: "findOneAndDelete"
+            arguments:
+                filter: { x: { $gte: 11 }}
+                sort: { x: 1 }
+        outcome:
+            result: { _id: 1, x: 11 }
+            collection:
+                data:
+                    - { _id: 2, x: 22 }
+    -
+        description: "FindOneAndDelete is not committed on first attempt"
+        clientOptions:
+            retryWrites: true
+        failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
+            mode: { times: 1 }
+            data: { failBeforeCommitExceptionCode: 1 }
+        operation:
+            name: "findOneAndDelete"
+            arguments:
+                filter: { x: { $gte: 11 }}
+                sort: { x: 1 }
+        outcome:
+            result: { _id: 1, x: 11 }
+            collection:
+                data:
+                    - { _id: 2, x: 22 }
     -
         description: "FindOneAndDelete is never committed"
+        clientOptions:
+            retryWrites: true
         failPoint:
+            configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
             data: { failBeforeCommitExceptionCode: 1 }
         operation:
@@ -49,4 +58,4 @@ tests:
             collection:
                 data:
                     - { _id: 1, x: 11 }
-                    - { _id: 2, x: 22 }
+                    - { _id: 2, x: 22 }