diff --git a/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.json b/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.json index 1099b6a1e9..b30e1540f4 100644 --- a/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.json +++ b/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.json @@ -3,7 +3,8 @@ "schemaVersion": "1.7", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.yml b/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.yml index fcc6b7b3ec..35b8d556fb 100644 --- a/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.yml +++ b/source/command-logging-and-monitoring/tests/monitoring/unacknowledged-client-bulkWrite.yml @@ -4,6 +4,7 @@ schemaVersion: "1.7" runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/bulk-write.md b/source/crud/bulk-write.md index 28c22c3ad4..522affbb75 100644 --- a/source/crud/bulk-write.md +++ b/source/crud/bulk-write.md @@ -781,6 +781,10 @@ the initial implementation and testing of the new bulk write API, but may be rev ## Q&A +### Is `bulkWrite` supported on Atlas Serverless? + +No. See [CLOUDP-256344](https://jira.mongodb.org/browse/CLOUDP-256344) + ### Why are we adding a new bulk write API rather than updating the `MongoCollection.bulkWrite` implementation? The new `bulkWrite` command is only available in MongoDB 8.0+, so it cannot function as a drop-in replacement for the diff --git a/source/crud/tests/README.md b/source/crud/tests/README.md index 8417ef1334..261d81c96f 100644 --- a/source/crud/tests/README.md +++ b/source/crud/tests/README.md @@ -70,7 +70,7 @@ WriteError's `details` property. Test that `MongoClient.bulkWrite` properly handles `writeModels` inputs containing a number of writes greater than `maxWriteBatchSize`. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -98,7 +98,7 @@ command. Assert that the length of `firstEvent.command.ops` is `maxWriteBatchSiz Test that `MongoClient.bulkWrite` properly handles a `writeModels` input which constructs an `ops` array larger than `maxMessageSizeBytes`. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -137,7 +137,7 @@ driver exposes `operationId`s in its CommandStartedEvents, assert that `firstEve Test that `MongoClient.bulkWrite` properly collects and reports `writeConcernError`s returned in separate batches. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with `retryWrites: false` configured and [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -182,7 +182,7 @@ Assert that two CommandStartedEvents were observed for the `bulkWrite` command. Test that `MongoClient.bulkWrite` handles individual write errors across batches for ordered and unordered bulk writes. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -237,7 +237,7 @@ Assert that one CommandStartedEvent was observed for the `bulkWrite` command. Test that `MongoClient.bulkWrite` properly iterates the results cursor when `getMore` is required. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -276,7 +276,8 @@ Assert that a CommandStartedEvent was observed for the `getMore` command. Test that `MongoClient.bulkWrite` executed within a transaction properly iterates the results cursor when `getMore` is required. -This test must only be run on 8.0+ servers. This test must not be run against standalone servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. This test must not be run +against standalone servers. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -318,7 +319,7 @@ Assert that a CommandStartedEvent was observed for the `getMore` command. Test that `MongoClient.bulkWrite` properly handles a failure that occurs when attempting a `getMore`. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) with [command monitoring](../../command-logging-and-monitoring/command-logging-and-monitoring.rst) enabled to observe @@ -369,7 +370,7 @@ Assert that a CommandStartedEvent was observed for the `killCursors` command. ### 10. `MongoClient.bulkWrite` returns error for unacknowledged too-large insert -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`). @@ -423,7 +424,7 @@ Expect a client-side error due the size. Test that `MongoClient.bulkWrite` batch splits a bulk write when the addition of a new namespace to `nsInfo` causes the size of the message to exceed `maxMessageSizeBytes - 1000`. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Repeat the following setup for each test case: @@ -603,8 +604,8 @@ remainingBulkWriteBytes = maxMessageSizeBytes - 1122 Test that `MongoClient.bulkWrite` returns an error if an operation provided exceeds `maxMessageSizeBytes` such that an empty `ops` payload would be sent. -This test must only be run on 8.0+ servers. This test may be skipped by drivers that are not able to construct -arbitrarily large documents. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. This test may be skipped by +drivers that are not able to construct arbitrarily large documents. Construct a `MongoClient` (referred to as `client`). Perform a `hello` command using `client` and record the `maxMessageSizeBytes` value contained in the response. @@ -649,7 +650,7 @@ This test is expected to be removed when [DRIVERS-2888](https://jira.mongodb.org Test that `MongoClient.bulkWrite` returns an error if the client has auto-encryption configured. -This test must only be run on 8.0+ servers. +This test must only be run on 8.0+ servers. This test must be skipped on Atlas Serverless. Construct a `MongoClient` (referred to as `client`) configured with the following `AutoEncryptionOpts`: diff --git a/source/crud/tests/unified/client-bulkWrite-delete-options.json b/source/crud/tests/unified/client-bulkWrite-delete-options.json index 5bdf2b124a..d9987897dc 100644 --- a/source/crud/tests/unified/client-bulkWrite-delete-options.json +++ b/source/crud/tests/unified/client-bulkWrite-delete-options.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite delete options", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-delete-options.yml b/source/crud/tests/unified/client-bulkWrite-delete-options.yml index db8b9f46d7..9297838535 100644 --- a/source/crud/tests/unified/client-bulkWrite-delete-options.yml +++ b/source/crud/tests/unified/client-bulkWrite-delete-options.yml @@ -1,7 +1,8 @@ description: "client bulkWrite delete options" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-errorResponse.json b/source/crud/tests/unified/client-bulkWrite-errorResponse.json index edf2339d8a..b828aad3b9 100644 --- a/source/crud/tests/unified/client-bulkWrite-errorResponse.json +++ b/source/crud/tests/unified/client-bulkWrite-errorResponse.json @@ -3,7 +3,8 @@ "schemaVersion": "1.12", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-errorResponse.yml b/source/crud/tests/unified/client-bulkWrite-errorResponse.yml index 45e53171ec..d63010afc7 100644 --- a/source/crud/tests/unified/client-bulkWrite-errorResponse.yml +++ b/source/crud/tests/unified/client-bulkWrite-errorResponse.yml @@ -2,6 +2,7 @@ description: "client bulkWrite errorResponse" schemaVersion: "1.12" runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-errors.json b/source/crud/tests/unified/client-bulkWrite-errors.json index 9f17f85331..8cc45bb5f2 100644 --- a/source/crud/tests/unified/client-bulkWrite-errors.json +++ b/source/crud/tests/unified/client-bulkWrite-errors.json @@ -3,7 +3,8 @@ "schemaVersion": "1.21", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-errors.yml b/source/crud/tests/unified/client-bulkWrite-errors.yml index 3a420f1429..6c513006ce 100644 --- a/source/crud/tests/unified/client-bulkWrite-errors.yml +++ b/source/crud/tests/unified/client-bulkWrite-errors.yml @@ -2,6 +2,7 @@ description: "client bulkWrite errors" schemaVersion: "1.21" runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.json b/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.json index f90755dc85..55f0618923 100644 --- a/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.json +++ b/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite with mixed namespaces", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.yml b/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.yml index 4e4cb01e16..9788bce8c5 100644 --- a/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.yml +++ b/source/crud/tests/unified/client-bulkWrite-mixed-namespaces.yml @@ -1,7 +1,8 @@ description: "client bulkWrite with mixed namespaces" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-options.json b/source/crud/tests/unified/client-bulkWrite-options.json index a1e6af3bf3..708fe4e85b 100644 --- a/source/crud/tests/unified/client-bulkWrite-options.json +++ b/source/crud/tests/unified/client-bulkWrite-options.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite top-level options", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-options.yml b/source/crud/tests/unified/client-bulkWrite-options.yml index fdcf788799..e0cbe747b3 100644 --- a/source/crud/tests/unified/client-bulkWrite-options.yml +++ b/source/crud/tests/unified/client-bulkWrite-options.yml @@ -1,7 +1,8 @@ description: "client bulkWrite top-level options" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-ordered.json b/source/crud/tests/unified/client-bulkWrite-ordered.json index a55d6619b5..6fb10d992f 100644 --- a/source/crud/tests/unified/client-bulkWrite-ordered.json +++ b/source/crud/tests/unified/client-bulkWrite-ordered.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite with ordered option", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-ordered.yml b/source/crud/tests/unified/client-bulkWrite-ordered.yml index dc56dcb860..48aa8ad40a 100644 --- a/source/crud/tests/unified/client-bulkWrite-ordered.yml +++ b/source/crud/tests/unified/client-bulkWrite-ordered.yml @@ -1,7 +1,8 @@ description: "client bulkWrite with ordered option" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-results.json b/source/crud/tests/unified/client-bulkWrite-results.json index 97a9e50b21..accf5a9cbf 100644 --- a/source/crud/tests/unified/client-bulkWrite-results.json +++ b/source/crud/tests/unified/client-bulkWrite-results.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite results", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-results.yml b/source/crud/tests/unified/client-bulkWrite-results.yml index eb001bbb42..86cb5346ae 100644 --- a/source/crud/tests/unified/client-bulkWrite-results.yml +++ b/source/crud/tests/unified/client-bulkWrite-results.yml @@ -1,7 +1,8 @@ description: "client bulkWrite results" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-update-options.json b/source/crud/tests/unified/client-bulkWrite-update-options.json index 93a2774e5f..ce6241c681 100644 --- a/source/crud/tests/unified/client-bulkWrite-update-options.json +++ b/source/crud/tests/unified/client-bulkWrite-update-options.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite update options", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-update-options.yml b/source/crud/tests/unified/client-bulkWrite-update-options.yml index fe188a490c..c5cc20d480 100644 --- a/source/crud/tests/unified/client-bulkWrite-update-options.yml +++ b/source/crud/tests/unified/client-bulkWrite-update-options.yml @@ -1,7 +1,8 @@ description: "client bulkWrite update options" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/crud/tests/unified/client-bulkWrite-update-pipeline.json b/source/crud/tests/unified/client-bulkWrite-update-pipeline.json index 57b6c9c1ba..9dba5ee6c5 100644 --- a/source/crud/tests/unified/client-bulkWrite-update-pipeline.json +++ b/source/crud/tests/unified/client-bulkWrite-update-pipeline.json @@ -1,9 +1,10 @@ { "description": "client bulkWrite update pipeline", - "schemaVersion": "1.1", + "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/crud/tests/unified/client-bulkWrite-update-pipeline.yml b/source/crud/tests/unified/client-bulkWrite-update-pipeline.yml index fe0e29a508..c90e93b47c 100644 --- a/source/crud/tests/unified/client-bulkWrite-update-pipeline.yml +++ b/source/crud/tests/unified/client-bulkWrite-update-pipeline.yml @@ -1,7 +1,8 @@ description: "client bulkWrite update pipeline" -schemaVersion: "1.1" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" + serverless: forbid createEntities: - client: diff --git a/source/retryable-writes/tests/etc/templates/handshakeError.yml.template b/source/retryable-writes/tests/etc/templates/handshakeError.yml.template index d9037d5b20..03b0e19bcd 100644 --- a/source/retryable-writes/tests/etc/templates/handshakeError.yml.template +++ b/source/retryable-writes/tests/etc/templates/handshakeError.yml.template @@ -2,7 +2,7 @@ description: "retryable writes handshake failures" -schemaVersion: "1.3" +schemaVersion: "1.4" # For `serverless: forbid` runOnRequirements: - minServerVersion: "4.2" @@ -54,6 +54,7 @@ tests: {%- if (operation.operation_name == 'clientBulkWrite') %} runOnRequirements: - minServerVersion: "8.0" # `bulkWrite` added to server 8.0 + serverless: forbid {%- endif %} operations: - name: failPoint @@ -102,6 +103,7 @@ tests: {%- if (operation.operation_name == 'clientBulkWrite') %} runOnRequirements: - minServerVersion: "8.0" # `bulkWrite` added to server 8.0 + serverless: forbid {%- endif %} operations: - name: failPoint diff --git a/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.json b/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.json index e2c0fb9c0a..d16e0c9c8d 100644 --- a/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.json +++ b/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.json @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.yml b/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.yml index 85696e89db..e5214b90f8 100644 --- a/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.yml +++ b/source/retryable-writes/tests/unified/client-bulkWrite-clientErrors.yml @@ -6,6 +6,7 @@ runOnRequirements: - replicaset - sharded - load-balanced + serverless: forbid createEntities: - client: diff --git a/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.json b/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.json index 4a0b210eb5..f58c82bcc7 100644 --- a/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.json +++ b/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.json @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.yml b/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.yml index 23d2c622ee..722e5cc8e0 100644 --- a/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.yml +++ b/source/retryable-writes/tests/unified/client-bulkWrite-serverErrors.yml @@ -6,6 +6,7 @@ runOnRequirements: - replicaset - sharded - load-balanced + serverless: forbid createEntities: - client: diff --git a/source/retryable-writes/tests/unified/handshakeError.json b/source/retryable-writes/tests/unified/handshakeError.json index 3c46463759..93cb2e849e 100644 --- a/source/retryable-writes/tests/unified/handshakeError.json +++ b/source/retryable-writes/tests/unified/handshakeError.json @@ -1,6 +1,6 @@ { "description": "retryable writes handshake failures", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "4.2", @@ -57,7 +57,8 @@ "description": "client.clientBulkWrite succeeds after retryable handshake network error", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "operations": [ @@ -165,7 +166,8 @@ "description": "client.clientBulkWrite succeeds after retryable handshake server error (ShutdownInProgress)", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "operations": [ diff --git a/source/retryable-writes/tests/unified/handshakeError.yml b/source/retryable-writes/tests/unified/handshakeError.yml index 131bbf2e5c..1743463370 100644 --- a/source/retryable-writes/tests/unified/handshakeError.yml +++ b/source/retryable-writes/tests/unified/handshakeError.yml @@ -2,7 +2,7 @@ description: "retryable writes handshake failures" -schemaVersion: "1.3" +schemaVersion: "1.4" # For `serverless: forbid` runOnRequirements: - minServerVersion: "4.2" @@ -53,6 +53,7 @@ tests: - description: "client.clientBulkWrite succeeds after retryable handshake network error" runOnRequirements: - minServerVersion: "8.0" # `bulkWrite` added to server 8.0 + serverless: forbid operations: - name: failPoint object: testRunner @@ -98,6 +99,7 @@ tests: - description: "client.clientBulkWrite succeeds after retryable handshake server error (ShutdownInProgress)" runOnRequirements: - minServerVersion: "8.0" # `bulkWrite` added to server 8.0 + serverless: forbid operations: - name: failPoint object: testRunner diff --git a/source/server-selection/tests/logging/operation-id.json b/source/server-selection/tests/logging/operation-id.json index 6cdbcb3f5a..c1024184ff 100644 --- a/source/server-selection/tests/logging/operation-id.json +++ b/source/server-selection/tests/logging/operation-id.json @@ -232,7 +232,8 @@ "description": "Successful client bulkWrite operation: log messages have operationIds", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "operations": [ @@ -304,7 +305,8 @@ "description": "Failed client bulkWrite operation: log messages have operationIds", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "operations": [ diff --git a/source/server-selection/tests/logging/operation-id.yml b/source/server-selection/tests/logging/operation-id.yml index 24e48f9410..1687fc392d 100644 --- a/source/server-selection/tests/logging/operation-id.yml +++ b/source/server-selection/tests/logging/operation-id.yml @@ -128,6 +128,7 @@ tests: - description: "Successful client bulkWrite operation: log messages have operationIds" runOnRequirements: - minServerVersion: "8.0" # required for bulkWrite command + serverless: forbid operations: # ensure we've discovered the server so it is immediately available # and no extra "waiting for suitable server" messages are emitted. @@ -165,6 +166,7 @@ tests: - description: "Failed client bulkWrite operation: log messages have operationIds" runOnRequirements: - minServerVersion: "8.0" # required for bulkWrite command + serverless: forbid operations: # fail all hello/legacy hello commands for the main client. - name: failPoint diff --git a/source/transactions/tests/unified/client-bulkWrite.json b/source/transactions/tests/unified/client-bulkWrite.json index f8f1d97169..4a8d013f8d 100644 --- a/source/transactions/tests/unified/client-bulkWrite.json +++ b/source/transactions/tests/unified/client-bulkWrite.json @@ -1,6 +1,6 @@ { "description": "client bulkWrite transactions", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "8.0", @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/source/transactions/tests/unified/client-bulkWrite.yml b/source/transactions/tests/unified/client-bulkWrite.yml index eda2babbe7..d80e618728 100644 --- a/source/transactions/tests/unified/client-bulkWrite.yml +++ b/source/transactions/tests/unified/client-bulkWrite.yml @@ -1,11 +1,12 @@ description: "client bulkWrite transactions" -schemaVersion: "1.3" +schemaVersion: "1.4" # To support `serverless: forbid` runOnRequirements: - minServerVersion: "8.0" topologies: - replicaset - sharded - load-balanced + serverless: forbid createEntities: - client: diff --git a/source/transactions/tests/unified/mongos-pin-auto-tests.py b/source/transactions/tests/unified/mongos-pin-auto-tests.py index ad2aeabd17..09306780fa 100644 --- a/source/transactions/tests/unified/mongos-pin-auto-tests.py +++ b/source/transactions/tests/unified/mongos-pin-auto-tests.py @@ -322,6 +322,7 @@ def create_pin_test(op_name, error_name): if op_name == 'clientBulkWrite': test += ' runOnRequirements:\n' test += ' - minServerVersion: "8.0" # `bulkWrite` added to server 8.0"\n' + test += ' serverless: forbid\n' return test @@ -337,6 +338,7 @@ def create_unpin_test(op_name, error_name): if op_name == 'clientBulkWrite': test += ' runOnRequirements:\n' test += ' - minServerVersion: "8.0" # `bulkWrite` added to server 8.0"\n' + test += ' serverless: forbid\n' return test diff --git a/source/versioned-api/tests/crud-api-version-1.json b/source/versioned-api/tests/crud-api-version-1.json index fe668620f8..23ef59a6d9 100644 --- a/source/versioned-api/tests/crud-api-version-1.json +++ b/source/versioned-api/tests/crud-api-version-1.json @@ -431,7 +431,8 @@ "description": "client bulkWrite appends declared API version", "runOnRequirements": [ { - "minServerVersion": "8.0" + "minServerVersion": "8.0", + "serverless": "forbid" } ], "operations": [ diff --git a/source/versioned-api/tests/crud-api-version-1.yml b/source/versioned-api/tests/crud-api-version-1.yml index cb9b45e57b..01e0323420 100644 --- a/source/versioned-api/tests/crud-api-version-1.yml +++ b/source/versioned-api/tests/crud-api-version-1.yml @@ -160,6 +160,7 @@ tests: - description: "client bulkWrite appends declared API version" runOnRequirements: - minServerVersion: "8.0" # `bulkWrite` added to server 8.0 + serverless: forbid operations: - name: clientBulkWrite object: *client