DRIVERS-716 Improved Bulk Write API

source/client-side-operations-timeout/tests/README.md

@@ -24,7 +24,7 @@ test MUST be unset using `internalClient` after the test has been executed. All
 MUST be configured with read/write concern `majority`, read preference `primary`, and command monitoring enabled to
 listen for `command_started` events.
 
-### 1. Multi-batch writes
+### 1. Multi-batch inserts
 
 This test MUST only run against standalones on server versions 4.4 and higher. The `insertMany` call takes an
 exceedingly long time on replicasets and sharded clusters. Drivers MAY adjust the timeouts used in this test to allow
@@ -598,6 +598,50 @@ Tests in this section MUST only run against replica sets and sharded clusters wi
    1. `command_started` and `command_failed` events for an `insert` command.
    2. `command_started` and `command_failed` events for an `abortTransaction` command.
 
+
+### 11. Multi-batch bulkWrites
+
+This test MUST only run against server versions 8.0+.
+
+1. Using `internalClient`, drop the `db.coll` collection.
+
+2. Using `internalClient`, set the following fail point:
+
+   ```javascript
+   {
+       configureFailPoint: "failCommand",
+       mode: {
+           times: 2
+       },
+       data: {
+           failCommands: ["bulkWrite"],
+           blockConnection: true,
+           blockTimeMS: 1010
+       }
+   }
+   ```
+
+3. Using `internalClient`, perform a `hello` command and record the `maxBsonObjectSize` and `maxMessageSizeBytes`
+   values in the response.
+
+4. Create a new MongoClient (referred to as `client`) with `timeoutMS=2000`.
+
+5. Create a list of write models (referred to as `models`) with the following write model repeated
+   (`maxMessageSizeBytes / maxBsonObjectSize + 1`) times:
+
+   ```json
+   InsertOne {
+      "namespace": "db.coll",
+      "document": { "a": "b".repeat(maxBsonObjectSize - 500) }
+   }
+   ```
+
+6. Call `bulkWrite` on `client` with `models`.
+
+   - Expect this to fail with a timeout error.
+
+7. Verify that two `bulkWrite` commands were executed as part of the `MongoClient.bulkWrite` call.
+
 ## Unit Tests
 
 The tests enumerated in this section could not be expressed in either spec or prose format. Drivers SHOULD implement

source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.yml

@@ -0,0 +1,93 @@
+description: "unacknowledged-client-bulkWrite"
+
+schemaVersion: "1.0"
+
+createEntities:
+  - client:
+      id: &client client
+      observeEvents:
+        - commandStartedEvent
+        - commandSucceededEvent
+        - commandFailedEvent
+      uriOptions:
+        w: 0
+  - database:
+      id: &database database
+      client: *client
+      databaseName: &databaseName command-monitoring-tests
+  - collection:
+      id: &collection collection
+      database: *database
+      collectionName: &collectionName test
+
+initialData:
+  - collectionName: *collectionName
+    databaseName: *databaseName
+    documents:
+      - { _id: 1, x: 11 }
+      - { _id: 2, x: 22 }
+      - { _id: 3, x: 33 }
+
+_yamlAnchors:
+  namespace: &namespace "command-monitoring-tests.test"
+
+tests:
+  - description: 'A successful mixed client bulkWrite'
+    operations:
+      - object: *client
+        name: clientBulkWrite
+        arguments:
+          models:
+            - insertOne:
+                namespace: *namespace
+                document: { _id: 4, x: 44 }
+            - updateOne:
+                namespace: *namespace
+                filter: { _id: 3 }
+                update: { $set: { x: 333 } }
+        expectResult:
+          insertedCount:
+            $$unsetOrMatches: 0
+          upsertedCount:
+            $$unsetOrMatches: 0
+          matchedCount:
+            $$unsetOrMatches: 0
+          modifiedCount:
+            $$unsetOrMatches: 0
+          deletedCount:
+            $$unsetOrMatches: 0
+          insertResults:
+            $$unsetOrMatches: {}
+          updateResults:
+            $$unsetOrMatches: {}
+          deleteResults:
+            $$unsetOrMatches: {}
+    expectEvents:
+      -
+        client: *client
+        events:
+          - commandStartedEvent:
+              commandName: bulkWrite
+              databaseName: admin
+              command:
+                bulkWrite: 1
+                errorsOnly: true
+                ordered: true
+                ops:
+                  - insert: 0
+                    document: { _id: 4, x: 44 }
+                  - update: 0
+                    filter: { _id: 3 }
+                    updateMods: { $set: { x: 333 } }
+                    multi: false
+                nsInfo:
+                  - ns: *namespace
+          - commandSucceededEvent:
+              commandName: bulkWrite
+              reply:
+                ok: 1
+                nInserted: { $$exists: false }
+                nMatched: { $$exists: false }
+                nModified: { $$exists: false }
+                nUpserted: { $$exists: false }
+                nDeleted: { $$exists: false }