Updated retryable-reads tests to latest spec version

Author: rozza

driver-core/src/test/functional/com/mongodb/client/CommandMonitoringTestHelper.java

@@ -81,12 +81,14 @@ public static List<CommandEvent> getExpectedEvents(final BsonArray expectedEvent
                 // If the spec test supplies a $db field in the command, then use that database.
                 if (commandDocument.containsKey("$db")) {
                     actualDatabaseName = commandDocument.getString("$db").getValue();
-                }
-                else if (commandName.equals("commitTransaction") || commandName.equals("abortTransaction")) {
-                    actualDatabaseName = "admin";
                 } else if (commandName.equals("")) {
                     commandName = commandDocument.keySet().iterator().next();
                 }
+
+                if (isAdminCommand(commandName)) {
+                    actualDatabaseName = "admin";
+                }
+
                 // Not clear whether these global fields should be included, but also not clear how to efficiently exclude them
                 if (ClusterFixture.serverVersionAtLeast(3, 6)) {
                     commandDocument.put("$db", new BsonString(actualDatabaseName));
@@ -110,6 +112,11 @@ else if (commandName.equals("commitTransaction") || commandName.equals("abortTra
         return expectedEvents;
     }
 
+    private static final List<String> ADMIN_COMMANDS = asList("commitTransaction", "abortTransaction", "listDatabases");
+    static boolean isAdminCommand(final String commandName) {
+        return ADMIN_COMMANDS.contains(commandName);
+    }
+
     static boolean isWriteCommand(final String commandName) {
         return asList("insert", "update", "delete").contains(commandName);
     }

driver-core/src/test/resources/retryable-reads/README.rst

@@ -84,7 +84,10 @@ Each YAML file has the following keys:
 - ``bucket_name``: Optional. The GridFS bucket name to use for testing.
 
 - ``data``: The data that should exist in the collection(s) under test before
-  each test run.
+  each test run. This will typically be an array of documents to be inserted
+  into the collection under test (i.e. ``collection_name``); however, this field
+  may also be an object mapping collection names to arrays of documents to be
+  inserted into the specified collection.
 
 - ``tests``: An array of tests that are to be run independently of each other.
   Each test will have some or all of the following fields:
@@ -126,6 +129,9 @@ GridFS Tests
 ------------
 
 GridFS tests are denoted by when the YAML file contains ``bucket_name``.
+The ``data`` field will also be an object, which maps collection names
+(e.g. ``fs.files``) to an array of documents that should be inserted into
+the specified collection.
 
 ``fs.files`` and ``fs.chunks`` should be created in the database
 specified by ``database_name``. This could be done via inserts or by

driver-core/src/test/resources/retryable-reads/aggregate-merge.json

@@ -0,0 +1,98 @@
+{
+  "runOn": [
+    {
+      "minServerVersion": "4.1.11"
+    }
+  ],
+  "database_name": "retryable-reads-tests",
+  "collection_name": "coll",
+  "data": [
+    {
+      "_id": 1,
+      "x": 11
+    },
+    {
+      "_id": 2,
+      "x": 22
+    },
+    {
+      "_id": 3,
+      "x": 33
+    }
+  ],
+  "tests": [
+    {
+      "description": "Aggregate with $merge does not retry",
+      "failPoint": {
+        "configureFailPoint": "failCommand",
+        "mode": {
+          "times": 1
+        },
+        "data": {
+          "failCommands": [
+            "aggregate"
+          ],
+          "closeConnection": true
+        }
+      },
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "_id": {
+                    "$gt": 1
+                  }
+                }
+              },
+              {
+                "$sort": {
+                  "x": 1
+                }
+              },
+              {
+                "$merge": {
+                  "into": "output-collection"
+                }
+              }
+            ]
+          },
+          "error": true
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "coll",
+              "pipeline": [
+                {
+                  "$match": {
+                    "_id": {
+                      "$gt": 1
+                    }
+                  }
+                },
+                {
+                  "$sort": {
+                    "x": 1
+                  }
+                },
+                {
+                  "$merge": {
+                    "into": "output-collection"
+                  }
+                }
+              ]
+            },
+            "command_name": "aggregate",
+            "database_name": "retryable-reads-tests"
+          }
+        }
+      ]
+    }
+  ]
+}

driver-core/src/test/resources/retryable-reads/aggregate-serverErrors.json

@@ -125,7 +125,7 @@
       ]
     },
     {
-      "description": "Aggregate succeeds after InterruptedDueToStepDown",
+      "description": "Aggregate succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/count-serverErrors.json

@@ -71,7 +71,7 @@
       ]
     },
     {
-      "description": "Count succeeds after InterruptedDueToStepDown",
+      "description": "Count succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/countDocuments-serverErrors.json

@@ -97,7 +97,7 @@
       ]
     },
     {
-      "description": "CountDocuments succeeds after InterruptedDueToStepDown",
+      "description": "CountDocuments succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/distinct-serverErrors.json

@@ -95,7 +95,7 @@
       ]
     },
     {
-      "description": "Distinct succeeds after InterruptedDueToStepDown",
+      "description": "Distinct succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/estimatedDocumentCount-serverErrors.json

@@ -68,7 +68,7 @@
       ]
     },
     {
-      "description": "EstimatedDocumentCount succeeds after InterruptedDueToStepDown",
+      "description": "EstimatedDocumentCount succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/find-serverErrors.json

@@ -114,7 +114,7 @@
       ]
     },
     {
-      "description": "Find succeeds after InterruptedDueToStepDown",
+      "description": "Find succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {

driver-core/src/test/resources/retryable-reads/findOne-serverErrors.json

@@ -94,7 +94,7 @@
       ]
     },
     {
-      "description": "FindOne succeeds after InterruptedDueToStepDown",
+      "description": "FindOne succeeds after InterruptedDueToReplStateChange",
       "failPoint": {
         "configureFailPoint": "failCommand",
         "mode": {