DRIVERS-1807 Keep existing retry behavior unless CSOT is enabled (#1317)

Multiple retryable read/write attempts may occur only when CSOT is enabled.
Adjust CSOT test timeouts to reduce flakiness.

Author: ShaneHarvey

source/client-side-operations-timeout/client-side-operations-timeout.rst

@@ -47,8 +47,10 @@ timeoutMS
 ~~~~~~~~~
 
 This 64-bit integer option specifies the per-operation timeout value in
-milliseconds. The default value is unset. Both unset and an explicit value of
-0 mean infinite, though some client-side timeouts like
+milliseconds. The default value is unset which means this feature is not
+enabled, i.e. the existing timeout behavior is unchanged (including
+``serverSelectionTimeoutMS``, ``connectTimeoutMS``, ``socketTimeoutMS`` etc..).
+An explicit value of 0 means infinite, though some client-side timeouts like
 ``serverSelectionTimeoutMS`` will still apply. Drivers MUST error if a
 negative value is specified. This value MUST be configurable at the level of
 a MongoClient, MongoDatabase, MongoCollection, or of a single operation.
@@ -347,7 +349,7 @@ Retryability
 ~~~~~~~~~~~~
 
 If an operation requires a retry per the retryable reads or writes
-specifications and ``timeoutMS`` is set to a non-zero value, drivers MUST
+specifications and ``timeoutMS`` is set, drivers MUST
 retry operations as many times as possible before the timeout expires or a
 retry attempt returns a non-retryable error. Once the timeout expires, a
 timeout error MUST be raised.

source/client-side-operations-timeout/etc/templates/retryability-legacy-timeouts.yml.template

@@ -15,7 +15,7 @@ createEntities:
   - client:
       id: &client client
       uriOptions:
-        socketTimeoutMS: 50
+        socketTimeoutMS: 100
       useMultipleMongoses: false
       observeEvents:
         - commandStartedEvent
@@ -38,8 +38,8 @@ initialData:
 tests:
   # For each retryable operation, run two tests:
   #
-  # 1. Socket timeouts are retried once - Each test constructs a client entity with socketTimeoutMS=50, configures a
-  # fail point to block the operation once for 55ms, and expects the operation to succeed.
+  # 1. Socket timeouts are retried once - Each test constructs a client entity with socketTimeoutMS=100, configures a
+  # fail point to block the operation once for 125ms, and expects the operation to succeed.
   #
   # 2. Operations fail after two consecutive socket timeouts - Same as (1) but the fail point is configured to block
   # the operation twice and the test expects the operation to fail.
@@ -57,7 +57,7 @@ tests:
             data:
               failCommands: ["{{operation.command_name}}"]
               blockConnection: true
-              blockTimeMS: 55
+              blockTimeMS: 125
       - name: {{operation.operation_name}}
         object: *{{operation.object}}
         {% if operation.arguments|length > 0 -%}
@@ -91,7 +91,7 @@ tests:
             data:
               failCommands: ["{{operation.command_name}}"]
               blockConnection: true
-              blockTimeMS: 55
+              blockTimeMS: 125
       - name: {{operation.operation_name}}
         object: *{{operation.object}}
         {% if operation.arguments|length > 0 -%}

source/client-side-operations-timeout/etc/templates/retryability-timeoutMS.yml.template

@@ -104,7 +104,7 @@ tests:
       - name: {{operation.operation_name}}
         object: *{{operation.object}}
         arguments:
-          timeoutMS: 500
+          timeoutMS: 1000
           {% for arg in operation.arguments -%}
           {{arg}}
           {% endfor %}

source/client-side-operations-timeout/tests/bulkWrite.json

@@ -19,7 +19,10 @@
         "useMultipleMongoses": false,
         "observeEvents": [
           "commandStartedEvent"
-        ]
+        ],
+        "uriOptions": {
+          "w": 1
+        }
       }
     },
     {
@@ -48,6 +51,13 @@
     {
       "description": "timeoutMS applied to entire bulkWrite, not individual commands",
       "operations": [
+        {
+          "name": "insertOne",
+          "object": "collection",
+          "arguments": {
+            "document": {}
+          }
+        },
         {
           "name": "failPoint",
           "object": "testRunner",
@@ -69,15 +79,6 @@
             }
           }
         },
-        {
-          "name": "find",
-          "object": "collection",
-          "arguments": {
-            "filter": {
-              "_id": 1
-            }
-          }
-        },
         {
           "name": "bulkWrite",
           "object": "collection",
@@ -114,10 +115,10 @@
           "events": [
             {
               "commandStartedEvent": {
-                "commandName": "find",
+                "commandName": "insert",
                 "databaseName": "test",
                 "command": {
-                  "find": "coll"
+                  "insert": "coll"
                 }
               }
             },

source/client-side-operations-timeout/tests/bulkWrite.yml

@@ -14,6 +14,9 @@ createEntities:
       useMultipleMongoses: false
       observeEvents:
         - commandStartedEvent
+      uriOptions:
+        # Used to speed up the test
+        w: 1
   - database:
       id: &database database
       client: *client
@@ -34,6 +37,11 @@ tests:
   # bulkWrite should fail with a timeout error.
   - description: "timeoutMS applied to entire bulkWrite, not individual commands"
     operations:
+      # Do an operation without a timeout to ensure the servers are discovered.
+      - name: insertOne
+        object: *collection
+        arguments:
+          document: {}
       - name: failPoint
         object: testRunner
         arguments:
@@ -45,11 +53,6 @@ tests:
               failCommands: ["insert", "update"]
               blockConnection: true
               blockTimeMS: 120
-      # Do an operation without a timeout to ensure the servers are discovered.
-      - name: find
-        object: *collection
-        arguments:
-          filter: { _id : 1 }
       - name: bulkWrite
         object: *collection
         arguments:
@@ -66,10 +69,10 @@ tests:
       - client: *client
         events:
           - commandStartedEvent:
-              commandName: find
+              commandName: insert
               databaseName: *databaseName
               command:
-                find: *collectionName
+                insert: *collectionName
           - commandStartedEvent:
               commandName: insert
               databaseName: *databaseName