From 259e8a5b2ce9e0d3e18a340d24fa1377339ab826 Mon Sep 17 00:00:00 2001 From: Connor MacDonald Date: Fri, 12 Sep 2025 10:33:59 -0400 Subject: [PATCH 1/5] Remove "serverless" from runOnRequirements --- .../unified/change-streams-clusterTime.json | 3 +- .../change-streams-disambiguatedPaths.json | 3 +- .../unified/change-streams-errors.json | 5 --- .../unified/change-streams-nsType.json | 3 +- .../change-streams-pre_and_post_images.json | 3 +- .../change-streams-resume-allowlist.json | 3 +- .../change-streams-resume-errorLabels.json | 3 +- .../change-streams-showExpandedEvents.json | 3 +- .../unified/change-streams.json | 3 +- .../legacy/fle2v2-BypassQueryAnalysis.json | 1 - .../legacy/fle2v2-CreateCollection.json | 1 - .../legacy/fle2v2-DecryptExistingData.json | 1 - .../legacy/fle2v2-Delete.json | 1 - ...EncryptedFields-vs-EncryptedFieldsMap.json | 1 - .../fle2v2-EncryptedFields-vs-jsonSchema.json | 1 - .../fle2v2-EncryptedFieldsMap-defaults.json | 1 - .../legacy/fle2v2-FindOneAndUpdate.json | 1 - .../legacy/fle2v2-InsertFind-Indexed.json | 1 - .../legacy/fle2v2-InsertFind-Unindexed.json | 1 - .../legacy/fle2v2-MissingKey.json | 1 - .../legacy/fle2v2-NoEncryption.json | 1 - .../legacy/fle2v2-Rangev2-Compact.json | 3 +- .../legacy/fle2v2-Update.json | 1 - ...v2-validatorAndPartialFieldExpression.json | 1 - .../unified/clustered-indexes.json | 3 +- data/crud/unified/aggregate-let.json | 3 +- .../unified/aggregate-out-readConcern.json | 3 +- .../aggregate-write-readPreference.json | 6 +-- .../db-aggregate-write-readPreference.json | 9 ++--- data/crud/unified/db-aggregate.json | 3 +- data/index-management/createSearchIndex.json | 3 +- .../index-management/createSearchIndexes.json | 3 +- data/index-management/dropSearchIndex.json | 3 +- data/index-management/listSearchIndexes.json | 3 +- .../searchIndexIgnoresReadWriteConcern.json | 3 +- data/index-management/updateSearchIndex.json | 3 +- .../unified/handshakeError.json | 40 ------------------- .../legacy/error-labels-errorLabels.json | 3 +- data/transactions/legacy/error-labels.json | 3 +- data/transactions/legacy/mongos-pin-auto.json | 3 +- .../mongos-recovery-token-errorLabels.json | 3 +- .../legacy/mongos-recovery-token.json | 3 +- data/transactions/legacy/pin-mongos.json | 3 +- ...-commit-errorLabels-forbid_serverless.json | 3 +- .../retryable-commit-forbid_serverless.json | 3 +- data/transactions/unified/mongos-unpin.json | 10 ----- .../unified/retryable-abort-handshake.json | 1 - .../unified/retryable-commit-handshake.json | 1 - .../valid-pass/poc-change-streams.json | 5 --- data/unified-format/valid-pass/poc-crud.json | 6 +-- .../crud-api-version-1-strict.json | 5 --- data/versioned-api/crud-api-version-1.json | 5 --- .../test-commands-strict-mode.json | 3 +- 53 files changed, 35 insertions(+), 156 deletions(-) diff --git a/data/change-streams/unified/change-streams-clusterTime.json b/data/change-streams/unified/change-streams-clusterTime.json index 2b09e548f1..89f41f146a 100644 --- a/data/change-streams/unified/change-streams-clusterTime.json +++ b/data/change-streams/unified/change-streams-clusterTime.json @@ -30,8 +30,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "initialData": [ diff --git a/data/change-streams/unified/change-streams-disambiguatedPaths.json b/data/change-streams/unified/change-streams-disambiguatedPaths.json index a8667b5436..924286746d 100644 --- a/data/change-streams/unified/change-streams-disambiguatedPaths.json +++ b/data/change-streams/unified/change-streams-disambiguatedPaths.json @@ -30,8 +30,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "initialData": [ diff --git a/data/change-streams/unified/change-streams-errors.json b/data/change-streams/unified/change-streams-errors.json index 65e99e541e..9a2db84854 100644 --- a/data/change-streams/unified/change-streams-errors.json +++ b/data/change-streams/unified/change-streams-errors.json @@ -1,11 +1,6 @@ { "description": "change-streams-errors", "schemaVersion": "1.7", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "createEntities": [ { "client": { diff --git a/data/change-streams/unified/change-streams-nsType.json b/data/change-streams/unified/change-streams-nsType.json index 1861c9a5e0..8f8da2ddbc 100644 --- a/data/change-streams/unified/change-streams-nsType.json +++ b/data/change-streams/unified/change-streams-nsType.json @@ -7,8 +7,7 @@ "topologies": [ "replicaset", "sharded" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-pre_and_post_images.json b/data/change-streams/unified/change-streams-pre_and_post_images.json index e62fc03459..4f01fe7fb4 100644 --- a/data/change-streams/unified/change-streams-pre_and_post_images.json +++ b/data/change-streams/unified/change-streams-pre_and_post_images.json @@ -8,8 +8,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-resume-allowlist.json b/data/change-streams/unified/change-streams-resume-allowlist.json index 1ec72b432b..ef0513e5f4 100644 --- a/data/change-streams/unified/change-streams-resume-allowlist.json +++ b/data/change-streams/unified/change-streams-resume-allowlist.json @@ -8,8 +8,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-resume-errorLabels.json b/data/change-streams/unified/change-streams-resume-errorLabels.json index 7fd70108f0..4c13bd192c 100644 --- a/data/change-streams/unified/change-streams-resume-errorLabels.json +++ b/data/change-streams/unified/change-streams-resume-errorLabels.json @@ -8,8 +8,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-showExpandedEvents.json b/data/change-streams/unified/change-streams-showExpandedEvents.json index b9594e0c1e..38e91e3f34 100644 --- a/data/change-streams/unified/change-streams-showExpandedEvents.json +++ b/data/change-streams/unified/change-streams-showExpandedEvents.json @@ -7,8 +7,7 @@ "topologies": [ "replicaset", "sharded" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams.json b/data/change-streams/unified/change-streams.json index a155d85b6e..b7c194aaed 100644 --- a/data/change-streams/unified/change-streams.json +++ b/data/change-streams/unified/change-streams.json @@ -6,8 +6,7 @@ "minServerVersion": "3.6", "topologies": [ "replicaset" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json b/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json index 6e3ff82a62..b1c49b1606 100644 --- a/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json +++ b/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-CreateCollection.json b/data/client_side_encryption/legacy/fle2v2-CreateCollection.json index 819d2eec3c..e429fca016 100644 --- a/data/client_side_encryption/legacy/fle2v2-CreateCollection.json +++ b/data/client_side_encryption/legacy/fle2v2-CreateCollection.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json b/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json index 905d3c9456..1fb4c1d1bc 100644 --- a/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json +++ b/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-Delete.json b/data/client_side_encryption/legacy/fle2v2-Delete.json index 492b053518..775f08fa30 100644 --- a/data/client_side_encryption/legacy/fle2v2-Delete.json +++ b/data/client_side_encryption/legacy/fle2v2-Delete.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json index b579979e94..bdc5c99bc2 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json index 4c05c44ad6..bff643aa06 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json index c2fea80a8d..c76de62642 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json b/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json index 7375d21b3d..5d780dafe5 100644 --- a/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json +++ b/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json b/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json index bb2c1ff1af..a926f222c2 100644 --- a/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json +++ b/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json b/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json index 008b0c959f..48280f5bd4 100644 --- a/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json +++ b/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-MissingKey.json b/data/client_side_encryption/legacy/fle2v2-MissingKey.json index 0b7e86bca3..8812a1f0a6 100644 --- a/data/client_side_encryption/legacy/fle2v2-MissingKey.json +++ b/data/client_side_encryption/legacy/fle2v2-MissingKey.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-NoEncryption.json b/data/client_side_encryption/legacy/fle2v2-NoEncryption.json index 185691d61c..a6843c4737 100644 --- a/data/client_side_encryption/legacy/fle2v2-NoEncryption.json +++ b/data/client_side_encryption/legacy/fle2v2-NoEncryption.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json b/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json index bba9f25535..59241927ca 100644 --- a/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json +++ b/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json @@ -6,8 +6,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "default", diff --git a/data/client_side_encryption/legacy/fle2v2-Update.json b/data/client_side_encryption/legacy/fle2v2-Update.json index f9e37f6e20..2f46e7e612 100644 --- a/data/client_side_encryption/legacy/fle2v2-Update.json +++ b/data/client_side_encryption/legacy/fle2v2-Update.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json b/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json index 4adf6fc07d..901c4dd841 100644 --- a/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json +++ b/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json @@ -2,7 +2,6 @@ "runOn": [ { "minServerVersion": "7.0.0", - "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/collection-management/unified/clustered-indexes.json b/data/collection-management/unified/clustered-indexes.json index 9db5ff06d7..b5c1a6958c 100644 --- a/data/collection-management/unified/clustered-indexes.json +++ b/data/collection-management/unified/clustered-indexes.json @@ -3,8 +3,7 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "5.3", - "serverless": "forbid" + "minServerVersion": "5.3" } ], "createEntities": [ diff --git a/data/crud/unified/aggregate-let.json b/data/crud/unified/aggregate-let.json index 039900920f..b7e6db52e5 100644 --- a/data/crud/unified/aggregate-let.json +++ b/data/crud/unified/aggregate-let.json @@ -207,8 +207,7 @@ "description": "Aggregate to collection with let option", "runOnRequirements": [ { - "minServerVersion": "5.0", - "serverless": "forbid" + "minServerVersion": "5.0" } ], "operations": [ diff --git a/data/crud/unified/aggregate-out-readConcern.json b/data/crud/unified/aggregate-out-readConcern.json index e293457c1c..bdd1ab783a 100644 --- a/data/crud/unified/aggregate-out-readConcern.json +++ b/data/crud/unified/aggregate-out-readConcern.json @@ -7,8 +7,7 @@ "topologies": [ "replicaset", "sharded" - ], - "serverless": "forbid" + ] } ], "createEntities": [ diff --git a/data/crud/unified/aggregate-write-readPreference.json b/data/crud/unified/aggregate-write-readPreference.json index c1fa3b4574..8931cbfc18 100644 --- a/data/crud/unified/aggregate-write-readPreference.json +++ b/data/crud/unified/aggregate-write-readPreference.json @@ -85,8 +85,7 @@ "description": "Aggregate with $out includes read preference for 5.0+ server", "runOnRequirements": [ { - "minServerVersion": "5.0", - "serverless": "forbid" + "minServerVersion": "5.0" } ], "operations": [ @@ -161,8 +160,7 @@ "runOnRequirements": [ { "minServerVersion": "4.2", - "maxServerVersion": "4.4.99", - "serverless": "forbid" + "maxServerVersion": "4.4.99" } ], "operations": [ diff --git a/data/crud/unified/db-aggregate-write-readPreference.json b/data/crud/unified/db-aggregate-write-readPreference.json index b6460f001f..1ac6b1efa9 100644 --- a/data/crud/unified/db-aggregate-write-readPreference.json +++ b/data/crud/unified/db-aggregate-write-readPreference.json @@ -6,8 +6,7 @@ "minServerVersion": "3.6", "topologies": [ "replicaset" - ], - "serverless": "forbid" + ] } ], "_yamlAnchors": { @@ -57,8 +56,7 @@ "description": "Database-level aggregate with $out includes read preference for 5.0+ server", "runOnRequirements": [ { - "minServerVersion": "5.0", - "serverless": "forbid" + "minServerVersion": "5.0" } ], "operations": [ @@ -141,8 +139,7 @@ "runOnRequirements": [ { "minServerVersion": "4.2", - "maxServerVersion": "4.4.99", - "serverless": "forbid" + "maxServerVersion": "4.4.99" } ], "operations": [ diff --git a/data/crud/unified/db-aggregate.json b/data/crud/unified/db-aggregate.json index 5015405bfc..648bb1245e 100644 --- a/data/crud/unified/db-aggregate.json +++ b/data/crud/unified/db-aggregate.json @@ -3,8 +3,7 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "3.6.0", - "serverless": "forbid" + "minServerVersion": "3.6.0" } ], "createEntities": [ diff --git a/data/index-management/createSearchIndex.json b/data/index-management/createSearchIndex.json index cfc1e3e98b..fe77c07df0 100644 --- a/data/index-management/createSearchIndex.json +++ b/data/index-management/createSearchIndex.json @@ -33,8 +33,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/index-management/createSearchIndexes.json b/data/index-management/createSearchIndexes.json index 72e106b27d..3abb5c9a30 100644 --- a/data/index-management/createSearchIndexes.json +++ b/data/index-management/createSearchIndexes.json @@ -33,8 +33,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/index-management/dropSearchIndex.json b/data/index-management/dropSearchIndex.json index d8957a2227..c7569259c4 100644 --- a/data/index-management/dropSearchIndex.json +++ b/data/index-management/dropSearchIndex.json @@ -33,8 +33,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/index-management/listSearchIndexes.json b/data/index-management/listSearchIndexes.json index a8cef42f7a..591b670d66 100644 --- a/data/index-management/listSearchIndexes.json +++ b/data/index-management/listSearchIndexes.json @@ -33,8 +33,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/index-management/searchIndexIgnoresReadWriteConcern.json b/data/index-management/searchIndexIgnoresReadWriteConcern.json index 47b4ccfa79..979313dc50 100644 --- a/data/index-management/searchIndexIgnoresReadWriteConcern.json +++ b/data/index-management/searchIndexIgnoresReadWriteConcern.json @@ -37,8 +37,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/index-management/updateSearchIndex.json b/data/index-management/updateSearchIndex.json index 76a5962146..76ee373af0 100644 --- a/data/index-management/updateSearchIndex.json +++ b/data/index-management/updateSearchIndex.json @@ -33,8 +33,7 @@ "replicaset", "load-balanced", "sharded" - ], - "serverless": "forbid" + ] } ], "tests": [ diff --git a/data/retryable-reads/unified/handshakeError.json b/data/retryable-reads/unified/handshakeError.json index 2921d8a954..6a2ea81714 100644 --- a/data/retryable-reads/unified/handshakeError.json +++ b/data/retryable-reads/unified/handshakeError.json @@ -429,11 +429,6 @@ }, { "description": "client.createChangeStream succeeds after retryable handshake network error", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -528,11 +523,6 @@ }, { "description": "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -627,11 +617,6 @@ }, { "description": "database.aggregate succeeds after retryable handshake network error", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -732,11 +717,6 @@ }, { "description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -1209,11 +1189,6 @@ }, { "description": "database.createChangeStream succeeds after retryable handshake network error", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -1308,11 +1283,6 @@ }, { "description": "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -2879,11 +2849,6 @@ }, { "description": "collection.createChangeStream succeeds after retryable handshake network error", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", @@ -2978,11 +2943,6 @@ }, { "description": "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "failPoint", diff --git a/data/transactions/legacy/error-labels-errorLabels.json b/data/transactions/legacy/error-labels-errorLabels.json index 50d90c36f8..795c54ea9c 100644 --- a/data/transactions/legacy/error-labels-errorLabels.json +++ b/data/transactions/legacy/error-labels-errorLabels.json @@ -6,8 +6,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/error-labels.json b/data/transactions/legacy/error-labels.json index ac1265517f..646e1b63f8 100644 --- a/data/transactions/legacy/error-labels.json +++ b/data/transactions/legacy/error-labels.json @@ -11,8 +11,7 @@ "topology": [ "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-pin-auto.json b/data/transactions/legacy/mongos-pin-auto.json index 037f212f49..f6ede52687 100644 --- a/data/transactions/legacy/mongos-pin-auto.json +++ b/data/transactions/legacy/mongos-pin-auto.json @@ -4,8 +4,7 @@ "minServerVersion": "4.1.8", "topology": [ "sharded" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-recovery-token-errorLabels.json b/data/transactions/legacy/mongos-recovery-token-errorLabels.json index 874dae2f69..ad943155d6 100644 --- a/data/transactions/legacy/mongos-recovery-token-errorLabels.json +++ b/data/transactions/legacy/mongos-recovery-token-errorLabels.json @@ -5,8 +5,7 @@ "topology": [ "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-recovery-token.json b/data/transactions/legacy/mongos-recovery-token.json index 3be3857ddd..0a6e72877f 100644 --- a/data/transactions/legacy/mongos-recovery-token.json +++ b/data/transactions/legacy/mongos-recovery-token.json @@ -5,8 +5,7 @@ "topology": [ "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/pin-mongos.json b/data/transactions/legacy/pin-mongos.json index 485a3d9322..e0f3a880bd 100644 --- a/data/transactions/legacy/pin-mongos.json +++ b/data/transactions/legacy/pin-mongos.json @@ -4,8 +4,7 @@ "minServerVersion": "4.1.8", "topology": [ "sharded" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json index bf65ed6eab..9b3b732c15 100644 --- a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json +++ b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json @@ -6,8 +6,7 @@ "replicaset", "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/retryable-commit-forbid_serverless.json b/data/transactions/legacy/retryable-commit-forbid_serverless.json index 374f18d7ef..93330c66a7 100644 --- a/data/transactions/legacy/retryable-commit-forbid_serverless.json +++ b/data/transactions/legacy/retryable-commit-forbid_serverless.json @@ -11,8 +11,7 @@ "topology": [ "sharded", "load-balanced" - ], - "serverless": "forbid" + ] } ], "database_name": "transaction-tests", diff --git a/data/transactions/unified/mongos-unpin.json b/data/transactions/unified/mongos-unpin.json index 356f4fd9b8..f30e818646 100644 --- a/data/transactions/unified/mongos-unpin.json +++ b/data/transactions/unified/mongos-unpin.json @@ -50,11 +50,6 @@ "tests": [ { "description": "unpin after TransientTransactionError error on commit", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "startTransaction", @@ -161,11 +156,6 @@ }, { "description": "unpin after non-transient error on abort", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "startTransaction", diff --git a/data/transactions/unified/retryable-abort-handshake.json b/data/transactions/unified/retryable-abort-handshake.json index 4ad56e2f2f..9ace3ecb37 100644 --- a/data/transactions/unified/retryable-abort-handshake.json +++ b/data/transactions/unified/retryable-abort-handshake.json @@ -9,7 +9,6 @@ "sharded", "load-balanced" ], - "serverless": "forbid", "auth": true } ], diff --git a/data/transactions/unified/retryable-commit-handshake.json b/data/transactions/unified/retryable-commit-handshake.json index d9315a8fc6..35d6d28979 100644 --- a/data/transactions/unified/retryable-commit-handshake.json +++ b/data/transactions/unified/retryable-commit-handshake.json @@ -9,7 +9,6 @@ "sharded", "load-balanced" ], - "serverless": "forbid", "auth": true } ], diff --git a/data/unified-format/valid-pass/poc-change-streams.json b/data/unified-format/valid-pass/poc-change-streams.json index 4194005eb4..2b6f2f0154 100644 --- a/data/unified-format/valid-pass/poc-change-streams.json +++ b/data/unified-format/valid-pass/poc-change-streams.json @@ -1,11 +1,6 @@ { "description": "poc-change-streams", "schemaVersion": "1.4", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "createEntities": [ { "client": { diff --git a/data/unified-format/valid-pass/poc-crud.json b/data/unified-format/valid-pass/poc-crud.json index 94e4ec5682..91932b9aed 100644 --- a/data/unified-format/valid-pass/poc-crud.json +++ b/data/unified-format/valid-pass/poc-crud.json @@ -323,8 +323,7 @@ "topologies": [ "replicaset", "sharded" - ], - "serverless": "forbid" + ] } ], "operations": [ @@ -409,8 +408,7 @@ "description": "Aggregate with $listLocalSessions", "runOnRequirements": [ { - "minServerVersion": "3.6.0", - "serverless": "forbid" + "minServerVersion": "3.6.0" } ], "operations": [ diff --git a/data/versioned-api/crud-api-version-1-strict.json b/data/versioned-api/crud-api-version-1-strict.json index c1c8ecce01..e9c7764d64 100644 --- a/data/versioned-api/crud-api-version-1-strict.json +++ b/data/versioned-api/crud-api-version-1-strict.json @@ -141,11 +141,6 @@ }, { "description": "aggregate on database appends declared API version", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "aggregate", diff --git a/data/versioned-api/crud-api-version-1.json b/data/versioned-api/crud-api-version-1.json index a387d0587e..509d07d9b7 100644 --- a/data/versioned-api/crud-api-version-1.json +++ b/data/versioned-api/crud-api-version-1.json @@ -141,11 +141,6 @@ }, { "description": "aggregate on database appends declared API version", - "runOnRequirements": [ - { - "serverless": "forbid" - } - ], "operations": [ { "name": "aggregate", diff --git a/data/versioned-api/test-commands-strict-mode.json b/data/versioned-api/test-commands-strict-mode.json index 9c4ebea785..7f5ebe8f67 100644 --- a/data/versioned-api/test-commands-strict-mode.json +++ b/data/versioned-api/test-commands-strict-mode.json @@ -6,8 +6,7 @@ "minServerVersion": "4.9", "serverParameters": { "enableTestCommands": true - }, - "serverless": "forbid" + } } ], "createEntities": [ From cf08ec56ae0257a1e581c75f6801dda55b9bf2d5 Mon Sep 17 00:00:00 2001 From: Connor MacDonald Date: Fri, 12 Sep 2025 10:36:34 -0400 Subject: [PATCH 2/5] Remove serverless testing EVG configs --- .../funcs/test_atlas_connectivity.py | 33 ------------ .../components/funcs/test_auth.py | 29 ---------- .evergreen/generated_configs/functions.yml | 44 --------------- .evergreen/scripts/connect.sh | 54 ------------------- 4 files changed, 160 deletions(-) delete mode 100644 .evergreen/config_generator/components/funcs/test_atlas_connectivity.py delete mode 100644 .evergreen/config_generator/components/funcs/test_auth.py delete mode 100755 .evergreen/scripts/connect.sh diff --git a/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py b/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py deleted file mode 100644 index 9fffb7b81a..0000000000 --- a/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py +++ /dev/null @@ -1,33 +0,0 @@ -from shrub.v3.evg_command import EvgCommandType - -from config_generator.etc.function import Function -from config_generator.etc.utils import bash_exec - - -class TestAtlasConnectivity(Function): - name = 'test atlas connectivity' - commands = bash_exec( - command_type=EvgCommandType.TEST, - silent=True, - working_dir='mongo-cxx-driver', - script="""\ - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - - # The atlas_serverless_uri expansion is set in the Evergreen project settings. - export URI="${atlas_serverless_uri}" - - ./.evergreen/scripts/connect.sh - """, - ) - - -def functions(): - return TestAtlasConnectivity.defn() diff --git a/.evergreen/config_generator/components/funcs/test_auth.py b/.evergreen/config_generator/components/funcs/test_auth.py deleted file mode 100644 index be1d5bbd87..0000000000 --- a/.evergreen/config_generator/components/funcs/test_auth.py +++ /dev/null @@ -1,29 +0,0 @@ -from shrub.v3.evg_command import EvgCommandType - -from config_generator.etc.function import Function -from config_generator.etc.utils import bash_exec - - -class TestAuth(Function): - name = 'test auth' - commands = bash_exec( - command_type=EvgCommandType.TEST, - working_dir='mongo-cxx-driver', - script="""\ - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - export URI="mongodb://bob:pwd123@localhost" - ./.evergreen/scripts/connect.sh - """, - ) - - -def functions(): - return TestAuth.defn() diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 330a945304..1796ac97ba 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -688,50 +688,6 @@ functions: args: - -c - .evergreen/scripts/test.sh - test atlas connectivity: - command: subprocess.exec - type: test - params: - binary: bash - working_dir: mongo-cxx-driver - silent: true - args: - - -c - - | - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - - # The atlas_serverless_uri expansion is set in the Evergreen project settings. - export URI="${atlas_serverless_uri}" - - ./.evergreen/scripts/connect.sh - test auth: - command: subprocess.exec - type: test - params: - binary: bash - working_dir: mongo-cxx-driver - args: - - -c - - | - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - export URI="mongodb://bob:pwd123@localhost" - ./.evergreen/scripts/connect.sh test-search-index-helpers: command: subprocess.exec type: test diff --git a/.evergreen/scripts/connect.sh b/.evergreen/scripts/connect.sh deleted file mode 100755 index 704b8ddb9d..0000000000 --- a/.evergreen/scripts/connect.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail - -LIB_DIR=${LIB_DIR:-"lib"} -BUILD_TYPE=${BUILD_TYPE:-"Debug"} - -print_usage_and_exit() { - echo "Error: $1" - cat < Date: Fri, 12 Sep 2025 16:27:49 -0400 Subject: [PATCH 3/5] Combine test files --- ...-commit-errorLabels-forbid_serverless.json | 239 ---------- .../legacy/retryable-commit-errorLabels.json | 222 +++++++++ .../retryable-commit-forbid_serverless.json | 428 ------------------ .../transactions/legacy/retryable-commit.json | 406 +++++++++++++++++ data/transactions/legacy/test_files.txt | 2 - 5 files changed, 628 insertions(+), 669 deletions(-) delete mode 100644 data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json delete mode 100644 data/transactions/legacy/retryable-commit-forbid_serverless.json diff --git a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json deleted file mode 100644 index 9b3b732c15..0000000000 --- a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json +++ /dev/null @@ -1,239 +0,0 @@ -{ - "runOn": [ - { - "minServerVersion": "4.3.1", - "topology": [ - "replicaset", - "sharded", - "load-balanced" - ] - } - ], - "database_name": "transaction-tests", - "collection_name": "test", - "data": [], - "tests": [ - { - "description": "commitTransaction succeeds after InterruptedAtShutdown", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "errorCode": 11600, - "errorLabels": [ - "RetryableWriteError" - ], - "closeConnection": false - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction succeeds after ShutdownInProgress", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "errorCode": 91, - "errorLabels": [ - "RetryableWriteError" - ], - "closeConnection": false - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - } - ] -} diff --git a/data/transactions/legacy/retryable-commit-errorLabels.json b/data/transactions/legacy/retryable-commit-errorLabels.json index 2e060c8a81..95f053400a 100644 --- a/data/transactions/legacy/retryable-commit-errorLabels.json +++ b/data/transactions/legacy/retryable-commit-errorLabels.json @@ -1706,6 +1706,228 @@ ] } } + }, + { + "description": "commitTransaction succeeds after InterruptedAtShutdown", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "errorCode": 11600, + "errorLabels": [ + "RetryableWriteError" + ], + "closeConnection": false + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction succeeds after ShutdownInProgress", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "errorCode": 91, + "errorLabels": [ + "RetryableWriteError" + ], + "closeConnection": false + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } } ] } diff --git a/data/transactions/legacy/retryable-commit-forbid_serverless.json b/data/transactions/legacy/retryable-commit-forbid_serverless.json deleted file mode 100644 index 93330c66a7..0000000000 --- a/data/transactions/legacy/retryable-commit-forbid_serverless.json +++ /dev/null @@ -1,428 +0,0 @@ -{ - "runOn": [ - { - "minServerVersion": "4.0", - "topology": [ - "replicaset" - ] - }, - { - "minServerVersion": "4.1.8", - "topology": [ - "sharded", - "load-balanced" - ] - } - ], - "database_name": "transaction-tests", - "collection_name": "test", - "data": [], - "tests": [ - { - "description": "commitTransaction fails after two errors", - "clientOptions": { - "retryWrites": false - }, - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 2 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0", - "result": { - "errorLabelsContain": [ - "RetryableWriteError", - "UnknownTransactionCommitResult" - ], - "errorLabelsOmit": [ - "TransientTransactionError" - ] - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction applies majority write concern on retries", - "clientOptions": { - "retryWrites": false - }, - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 2 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0", - "arguments": { - "options": { - "writeConcern": { - "w": 2, - "j": true, - "wtimeout": 5000 - } - } - } - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0", - "result": { - "errorLabelsContain": [ - "RetryableWriteError", - "UnknownTransactionCommitResult" - ], - "errorLabelsOmit": [ - "TransientTransactionError" - ] - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": 2, - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction succeeds after connection error", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - } - ] -} diff --git a/data/transactions/legacy/retryable-commit.json b/data/transactions/legacy/retryable-commit.json index e56440d303..b0b6586171 100644 --- a/data/transactions/legacy/retryable-commit.json +++ b/data/transactions/legacy/retryable-commit.json @@ -217,6 +217,412 @@ ] } } + }, + { + "description": "commitTransaction fails after two errors", + "clientOptions": { + "retryWrites": false + }, + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 2 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0", + "result": { + "errorLabelsContain": [ + "RetryableWriteError", + "UnknownTransactionCommitResult" + ], + "errorLabelsOmit": [ + "TransientTransactionError" + ] + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction applies majority write concern on retries", + "clientOptions": { + "retryWrites": false + }, + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 2 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0", + "arguments": { + "options": { + "writeConcern": { + "w": 2, + "j": true, + "wtimeout": 5000 + } + } + } + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0", + "result": { + "errorLabelsContain": [ + "RetryableWriteError", + "UnknownTransactionCommitResult" + ], + "errorLabelsOmit": [ + "TransientTransactionError" + ] + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": 2, + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction succeeds after connection error", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } } ] } diff --git a/data/transactions/legacy/test_files.txt b/data/transactions/legacy/test_files.txt index e10dd609a0..8ea96a1960 100644 --- a/data/transactions/legacy/test_files.txt +++ b/data/transactions/legacy/test_files.txt @@ -24,8 +24,6 @@ read-pref.json reads.json retryable-abort-errorLabels.json retryable-abort.json -retryable-commit-errorLabels-forbid_serverless.json -retryable-commit-forbid_serverless.json retryable-commit-errorLabels.json retryable-commit.json retryable-writes.json From 877223e8480b3479ac68d20f448ac6ab1625657b Mon Sep 17 00:00:00 2001 From: Connor MacDonald Date: Mon, 15 Sep 2025 13:19:28 -0400 Subject: [PATCH 4/5] Revert "Combine test files" This reverts commit 98aff2c4f5387f343b4eb3a89d70d9575a05474e. --- ...-commit-errorLabels-forbid_serverless.json | 239 ++++++++++ .../legacy/retryable-commit-errorLabels.json | 222 --------- .../retryable-commit-forbid_serverless.json | 428 ++++++++++++++++++ .../transactions/legacy/retryable-commit.json | 406 ----------------- data/transactions/legacy/test_files.txt | 2 + 5 files changed, 669 insertions(+), 628 deletions(-) create mode 100644 data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json create mode 100644 data/transactions/legacy/retryable-commit-forbid_serverless.json diff --git a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json new file mode 100644 index 0000000000..9b3b732c15 --- /dev/null +++ b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json @@ -0,0 +1,239 @@ +{ + "runOn": [ + { + "minServerVersion": "4.3.1", + "topology": [ + "replicaset", + "sharded", + "load-balanced" + ] + } + ], + "database_name": "transaction-tests", + "collection_name": "test", + "data": [], + "tests": [ + { + "description": "commitTransaction succeeds after InterruptedAtShutdown", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "errorCode": 11600, + "errorLabels": [ + "RetryableWriteError" + ], + "closeConnection": false + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction succeeds after ShutdownInProgress", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "errorCode": 91, + "errorLabels": [ + "RetryableWriteError" + ], + "closeConnection": false + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + } + ] +} diff --git a/data/transactions/legacy/retryable-commit-errorLabels.json b/data/transactions/legacy/retryable-commit-errorLabels.json index 95f053400a..2e060c8a81 100644 --- a/data/transactions/legacy/retryable-commit-errorLabels.json +++ b/data/transactions/legacy/retryable-commit-errorLabels.json @@ -1706,228 +1706,6 @@ ] } } - }, - { - "description": "commitTransaction succeeds after InterruptedAtShutdown", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "errorCode": 11600, - "errorLabels": [ - "RetryableWriteError" - ], - "closeConnection": false - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction succeeds after ShutdownInProgress", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "errorCode": 91, - "errorLabels": [ - "RetryableWriteError" - ], - "closeConnection": false - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } } ] } diff --git a/data/transactions/legacy/retryable-commit-forbid_serverless.json b/data/transactions/legacy/retryable-commit-forbid_serverless.json new file mode 100644 index 0000000000..93330c66a7 --- /dev/null +++ b/data/transactions/legacy/retryable-commit-forbid_serverless.json @@ -0,0 +1,428 @@ +{ + "runOn": [ + { + "minServerVersion": "4.0", + "topology": [ + "replicaset" + ] + }, + { + "minServerVersion": "4.1.8", + "topology": [ + "sharded", + "load-balanced" + ] + } + ], + "database_name": "transaction-tests", + "collection_name": "test", + "data": [], + "tests": [ + { + "description": "commitTransaction fails after two errors", + "clientOptions": { + "retryWrites": false + }, + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 2 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0", + "result": { + "errorLabelsContain": [ + "RetryableWriteError", + "UnknownTransactionCommitResult" + ], + "errorLabelsOmit": [ + "TransientTransactionError" + ] + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction applies majority write concern on retries", + "clientOptions": { + "retryWrites": false + }, + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 2 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0", + "arguments": { + "options": { + "writeConcern": { + "w": 2, + "j": true, + "wtimeout": 5000 + } + } + } + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0", + "result": { + "errorLabelsContain": [ + "RetryableWriteError", + "UnknownTransactionCommitResult" + ], + "errorLabelsOmit": [ + "TransientTransactionError" + ] + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": 2, + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "j": true, + "wtimeout": 5000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + }, + { + "description": "commitTransaction succeeds after connection error", + "failPoint": { + "configureFailPoint": "failCommand", + "mode": { + "times": 1 + }, + "data": { + "failCommands": [ + "commitTransaction" + ], + "closeConnection": true + } + }, + "operations": [ + { + "name": "startTransaction", + "object": "session0" + }, + { + "name": "insertOne", + "object": "collection", + "arguments": { + "session": "session0", + "document": { + "_id": 1 + } + }, + "result": { + "insertedId": 1 + } + }, + { + "name": "commitTransaction", + "object": "session0" + } + ], + "expectations": [ + { + "command_started_event": { + "command": { + "insert": "test", + "documents": [ + { + "_id": 1 + } + ], + "ordered": true, + "readConcern": null, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": true, + "autocommit": false, + "writeConcern": null + }, + "command_name": "insert", + "database_name": "transaction-tests" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": null + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + }, + { + "command_started_event": { + "command": { + "commitTransaction": 1, + "lsid": "session0", + "txnNumber": { + "$numberLong": "1" + }, + "startTransaction": null, + "autocommit": false, + "writeConcern": { + "w": "majority", + "wtimeout": 10000 + } + }, + "command_name": "commitTransaction", + "database_name": "admin" + } + } + ], + "outcome": { + "collection": { + "data": [ + { + "_id": 1 + } + ] + } + } + } + ] +} diff --git a/data/transactions/legacy/retryable-commit.json b/data/transactions/legacy/retryable-commit.json index b0b6586171..e56440d303 100644 --- a/data/transactions/legacy/retryable-commit.json +++ b/data/transactions/legacy/retryable-commit.json @@ -217,412 +217,6 @@ ] } } - }, - { - "description": "commitTransaction fails after two errors", - "clientOptions": { - "retryWrites": false - }, - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 2 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0", - "result": { - "errorLabelsContain": [ - "RetryableWriteError", - "UnknownTransactionCommitResult" - ], - "errorLabelsOmit": [ - "TransientTransactionError" - ] - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction applies majority write concern on retries", - "clientOptions": { - "retryWrites": false - }, - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 2 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0", - "arguments": { - "options": { - "writeConcern": { - "w": 2, - "j": true, - "wtimeout": 5000 - } - } - } - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0", - "result": { - "errorLabelsContain": [ - "RetryableWriteError", - "UnknownTransactionCommitResult" - ], - "errorLabelsOmit": [ - "TransientTransactionError" - ] - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": 2, - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "j": true, - "wtimeout": 5000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } - }, - { - "description": "commitTransaction succeeds after connection error", - "failPoint": { - "configureFailPoint": "failCommand", - "mode": { - "times": 1 - }, - "data": { - "failCommands": [ - "commitTransaction" - ], - "closeConnection": true - } - }, - "operations": [ - { - "name": "startTransaction", - "object": "session0" - }, - { - "name": "insertOne", - "object": "collection", - "arguments": { - "session": "session0", - "document": { - "_id": 1 - } - }, - "result": { - "insertedId": 1 - } - }, - { - "name": "commitTransaction", - "object": "session0" - } - ], - "expectations": [ - { - "command_started_event": { - "command": { - "insert": "test", - "documents": [ - { - "_id": 1 - } - ], - "ordered": true, - "readConcern": null, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": true, - "autocommit": false, - "writeConcern": null - }, - "command_name": "insert", - "database_name": "transaction-tests" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": null - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - }, - { - "command_started_event": { - "command": { - "commitTransaction": 1, - "lsid": "session0", - "txnNumber": { - "$numberLong": "1" - }, - "startTransaction": null, - "autocommit": false, - "writeConcern": { - "w": "majority", - "wtimeout": 10000 - } - }, - "command_name": "commitTransaction", - "database_name": "admin" - } - } - ], - "outcome": { - "collection": { - "data": [ - { - "_id": 1 - } - ] - } - } } ] } diff --git a/data/transactions/legacy/test_files.txt b/data/transactions/legacy/test_files.txt index 8ea96a1960..e10dd609a0 100644 --- a/data/transactions/legacy/test_files.txt +++ b/data/transactions/legacy/test_files.txt @@ -24,6 +24,8 @@ read-pref.json reads.json retryable-abort-errorLabels.json retryable-abort.json +retryable-commit-errorLabels-forbid_serverless.json +retryable-commit-forbid_serverless.json retryable-commit-errorLabels.json retryable-commit.json retryable-writes.json From d7ad05b63a98ab2500ce68a8a84e37b0cd565863 Mon Sep 17 00:00:00 2001 From: Connor MacDonald Date: Mon, 15 Sep 2025 13:20:35 -0400 Subject: [PATCH 5/5] Revert "Remove "serverless" from runOnRequirements" This reverts commit 259e8a5b2ce9e0d3e18a340d24fa1377339ab826. --- .../unified/change-streams-clusterTime.json | 3 +- .../change-streams-disambiguatedPaths.json | 3 +- .../unified/change-streams-errors.json | 5 +++ .../unified/change-streams-nsType.json | 3 +- .../change-streams-pre_and_post_images.json | 3 +- .../change-streams-resume-allowlist.json | 3 +- .../change-streams-resume-errorLabels.json | 3 +- .../change-streams-showExpandedEvents.json | 3 +- .../unified/change-streams.json | 3 +- .../legacy/fle2v2-BypassQueryAnalysis.json | 1 + .../legacy/fle2v2-CreateCollection.json | 1 + .../legacy/fle2v2-DecryptExistingData.json | 1 + .../legacy/fle2v2-Delete.json | 1 + ...EncryptedFields-vs-EncryptedFieldsMap.json | 1 + .../fle2v2-EncryptedFields-vs-jsonSchema.json | 1 + .../fle2v2-EncryptedFieldsMap-defaults.json | 1 + .../legacy/fle2v2-FindOneAndUpdate.json | 1 + .../legacy/fle2v2-InsertFind-Indexed.json | 1 + .../legacy/fle2v2-InsertFind-Unindexed.json | 1 + .../legacy/fle2v2-MissingKey.json | 1 + .../legacy/fle2v2-NoEncryption.json | 1 + .../legacy/fle2v2-Rangev2-Compact.json | 3 +- .../legacy/fle2v2-Update.json | 1 + ...v2-validatorAndPartialFieldExpression.json | 1 + .../unified/clustered-indexes.json | 3 +- data/crud/unified/aggregate-let.json | 3 +- .../unified/aggregate-out-readConcern.json | 3 +- .../aggregate-write-readPreference.json | 6 ++- .../db-aggregate-write-readPreference.json | 9 +++-- data/crud/unified/db-aggregate.json | 3 +- data/index-management/createSearchIndex.json | 3 +- .../index-management/createSearchIndexes.json | 3 +- data/index-management/dropSearchIndex.json | 3 +- data/index-management/listSearchIndexes.json | 3 +- .../searchIndexIgnoresReadWriteConcern.json | 3 +- data/index-management/updateSearchIndex.json | 3 +- .../unified/handshakeError.json | 40 +++++++++++++++++++ .../legacy/error-labels-errorLabels.json | 3 +- data/transactions/legacy/error-labels.json | 3 +- data/transactions/legacy/mongos-pin-auto.json | 3 +- .../mongos-recovery-token-errorLabels.json | 3 +- .../legacy/mongos-recovery-token.json | 3 +- data/transactions/legacy/pin-mongos.json | 3 +- ...-commit-errorLabels-forbid_serverless.json | 3 +- .../retryable-commit-forbid_serverless.json | 3 +- data/transactions/unified/mongos-unpin.json | 10 +++++ .../unified/retryable-abort-handshake.json | 1 + .../unified/retryable-commit-handshake.json | 1 + .../valid-pass/poc-change-streams.json | 5 +++ data/unified-format/valid-pass/poc-crud.json | 6 ++- .../crud-api-version-1-strict.json | 5 +++ data/versioned-api/crud-api-version-1.json | 5 +++ .../test-commands-strict-mode.json | 3 +- 53 files changed, 156 insertions(+), 35 deletions(-) diff --git a/data/change-streams/unified/change-streams-clusterTime.json b/data/change-streams/unified/change-streams-clusterTime.json index 89f41f146a..2b09e548f1 100644 --- a/data/change-streams/unified/change-streams-clusterTime.json +++ b/data/change-streams/unified/change-streams-clusterTime.json @@ -30,7 +30,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "initialData": [ diff --git a/data/change-streams/unified/change-streams-disambiguatedPaths.json b/data/change-streams/unified/change-streams-disambiguatedPaths.json index 924286746d..a8667b5436 100644 --- a/data/change-streams/unified/change-streams-disambiguatedPaths.json +++ b/data/change-streams/unified/change-streams-disambiguatedPaths.json @@ -30,7 +30,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "initialData": [ diff --git a/data/change-streams/unified/change-streams-errors.json b/data/change-streams/unified/change-streams-errors.json index 9a2db84854..65e99e541e 100644 --- a/data/change-streams/unified/change-streams-errors.json +++ b/data/change-streams/unified/change-streams-errors.json @@ -1,6 +1,11 @@ { "description": "change-streams-errors", "schemaVersion": "1.7", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "createEntities": [ { "client": { diff --git a/data/change-streams/unified/change-streams-nsType.json b/data/change-streams/unified/change-streams-nsType.json index 8f8da2ddbc..1861c9a5e0 100644 --- a/data/change-streams/unified/change-streams-nsType.json +++ b/data/change-streams/unified/change-streams-nsType.json @@ -7,7 +7,8 @@ "topologies": [ "replicaset", "sharded" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-pre_and_post_images.json b/data/change-streams/unified/change-streams-pre_and_post_images.json index 4f01fe7fb4..e62fc03459 100644 --- a/data/change-streams/unified/change-streams-pre_and_post_images.json +++ b/data/change-streams/unified/change-streams-pre_and_post_images.json @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-resume-allowlist.json b/data/change-streams/unified/change-streams-resume-allowlist.json index ef0513e5f4..1ec72b432b 100644 --- a/data/change-streams/unified/change-streams-resume-allowlist.json +++ b/data/change-streams/unified/change-streams-resume-allowlist.json @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-resume-errorLabels.json b/data/change-streams/unified/change-streams-resume-errorLabels.json index 4c13bd192c..7fd70108f0 100644 --- a/data/change-streams/unified/change-streams-resume-errorLabels.json +++ b/data/change-streams/unified/change-streams-resume-errorLabels.json @@ -8,7 +8,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams-showExpandedEvents.json b/data/change-streams/unified/change-streams-showExpandedEvents.json index 38e91e3f34..b9594e0c1e 100644 --- a/data/change-streams/unified/change-streams-showExpandedEvents.json +++ b/data/change-streams/unified/change-streams-showExpandedEvents.json @@ -7,7 +7,8 @@ "topologies": [ "replicaset", "sharded" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/change-streams/unified/change-streams.json b/data/change-streams/unified/change-streams.json index b7c194aaed..a155d85b6e 100644 --- a/data/change-streams/unified/change-streams.json +++ b/data/change-streams/unified/change-streams.json @@ -6,7 +6,8 @@ "minServerVersion": "3.6", "topologies": [ "replicaset" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json b/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json index b1c49b1606..6e3ff82a62 100644 --- a/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json +++ b/data/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-CreateCollection.json b/data/client_side_encryption/legacy/fle2v2-CreateCollection.json index e429fca016..819d2eec3c 100644 --- a/data/client_side_encryption/legacy/fle2v2-CreateCollection.json +++ b/data/client_side_encryption/legacy/fle2v2-CreateCollection.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json b/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json index 1fb4c1d1bc..905d3c9456 100644 --- a/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json +++ b/data/client_side_encryption/legacy/fle2v2-DecryptExistingData.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-Delete.json b/data/client_side_encryption/legacy/fle2v2-Delete.json index 775f08fa30..492b053518 100644 --- a/data/client_side_encryption/legacy/fle2v2-Delete.json +++ b/data/client_side_encryption/legacy/fle2v2-Delete.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json index bdc5c99bc2..b579979e94 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-EncryptedFieldsMap.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json index bff643aa06..4c05c44ad6 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFields-vs-jsonSchema.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json b/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json index c76de62642..c2fea80a8d 100644 --- a/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json +++ b/data/client_side_encryption/legacy/fle2v2-EncryptedFieldsMap-defaults.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json b/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json index 5d780dafe5..7375d21b3d 100644 --- a/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json +++ b/data/client_side_encryption/legacy/fle2v2-FindOneAndUpdate.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json b/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json index a926f222c2..bb2c1ff1af 100644 --- a/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json +++ b/data/client_side_encryption/legacy/fle2v2-InsertFind-Indexed.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json b/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json index 48280f5bd4..008b0c959f 100644 --- a/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json +++ b/data/client_side_encryption/legacy/fle2v2-InsertFind-Unindexed.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-MissingKey.json b/data/client_side_encryption/legacy/fle2v2-MissingKey.json index 8812a1f0a6..0b7e86bca3 100644 --- a/data/client_side_encryption/legacy/fle2v2-MissingKey.json +++ b/data/client_side_encryption/legacy/fle2v2-MissingKey.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-NoEncryption.json b/data/client_side_encryption/legacy/fle2v2-NoEncryption.json index a6843c4737..185691d61c 100644 --- a/data/client_side_encryption/legacy/fle2v2-NoEncryption.json +++ b/data/client_side_encryption/legacy/fle2v2-NoEncryption.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json b/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json index 59241927ca..bba9f25535 100644 --- a/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json +++ b/data/client_side_encryption/legacy/fle2v2-Rangev2-Compact.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "default", diff --git a/data/client_side_encryption/legacy/fle2v2-Update.json b/data/client_side_encryption/legacy/fle2v2-Update.json index 2f46e7e612..f9e37f6e20 100644 --- a/data/client_side_encryption/legacy/fle2v2-Update.json +++ b/data/client_side_encryption/legacy/fle2v2-Update.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json b/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json index 901c4dd841..4adf6fc07d 100644 --- a/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json +++ b/data/client_side_encryption/legacy/fle2v2-validatorAndPartialFieldExpression.json @@ -2,6 +2,7 @@ "runOn": [ { "minServerVersion": "7.0.0", + "serverless": "forbid", "topology": [ "replicaset", "sharded", diff --git a/data/collection-management/unified/clustered-indexes.json b/data/collection-management/unified/clustered-indexes.json index b5c1a6958c..9db5ff06d7 100644 --- a/data/collection-management/unified/clustered-indexes.json +++ b/data/collection-management/unified/clustered-indexes.json @@ -3,7 +3,8 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "5.3" + "minServerVersion": "5.3", + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/crud/unified/aggregate-let.json b/data/crud/unified/aggregate-let.json index b7e6db52e5..039900920f 100644 --- a/data/crud/unified/aggregate-let.json +++ b/data/crud/unified/aggregate-let.json @@ -207,7 +207,8 @@ "description": "Aggregate to collection with let option", "runOnRequirements": [ { - "minServerVersion": "5.0" + "minServerVersion": "5.0", + "serverless": "forbid" } ], "operations": [ diff --git a/data/crud/unified/aggregate-out-readConcern.json b/data/crud/unified/aggregate-out-readConcern.json index bdd1ab783a..e293457c1c 100644 --- a/data/crud/unified/aggregate-out-readConcern.json +++ b/data/crud/unified/aggregate-out-readConcern.json @@ -7,7 +7,8 @@ "topologies": [ "replicaset", "sharded" - ] + ], + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/crud/unified/aggregate-write-readPreference.json b/data/crud/unified/aggregate-write-readPreference.json index 8931cbfc18..c1fa3b4574 100644 --- a/data/crud/unified/aggregate-write-readPreference.json +++ b/data/crud/unified/aggregate-write-readPreference.json @@ -85,7 +85,8 @@ "description": "Aggregate with $out includes read preference for 5.0+ server", "runOnRequirements": [ { - "minServerVersion": "5.0" + "minServerVersion": "5.0", + "serverless": "forbid" } ], "operations": [ @@ -160,7 +161,8 @@ "runOnRequirements": [ { "minServerVersion": "4.2", - "maxServerVersion": "4.4.99" + "maxServerVersion": "4.4.99", + "serverless": "forbid" } ], "operations": [ diff --git a/data/crud/unified/db-aggregate-write-readPreference.json b/data/crud/unified/db-aggregate-write-readPreference.json index 1ac6b1efa9..b6460f001f 100644 --- a/data/crud/unified/db-aggregate-write-readPreference.json +++ b/data/crud/unified/db-aggregate-write-readPreference.json @@ -6,7 +6,8 @@ "minServerVersion": "3.6", "topologies": [ "replicaset" - ] + ], + "serverless": "forbid" } ], "_yamlAnchors": { @@ -56,7 +57,8 @@ "description": "Database-level aggregate with $out includes read preference for 5.0+ server", "runOnRequirements": [ { - "minServerVersion": "5.0" + "minServerVersion": "5.0", + "serverless": "forbid" } ], "operations": [ @@ -139,7 +141,8 @@ "runOnRequirements": [ { "minServerVersion": "4.2", - "maxServerVersion": "4.4.99" + "maxServerVersion": "4.4.99", + "serverless": "forbid" } ], "operations": [ diff --git a/data/crud/unified/db-aggregate.json b/data/crud/unified/db-aggregate.json index 648bb1245e..5015405bfc 100644 --- a/data/crud/unified/db-aggregate.json +++ b/data/crud/unified/db-aggregate.json @@ -3,7 +3,8 @@ "schemaVersion": "1.4", "runOnRequirements": [ { - "minServerVersion": "3.6.0" + "minServerVersion": "3.6.0", + "serverless": "forbid" } ], "createEntities": [ diff --git a/data/index-management/createSearchIndex.json b/data/index-management/createSearchIndex.json index fe77c07df0..cfc1e3e98b 100644 --- a/data/index-management/createSearchIndex.json +++ b/data/index-management/createSearchIndex.json @@ -33,7 +33,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/index-management/createSearchIndexes.json b/data/index-management/createSearchIndexes.json index 3abb5c9a30..72e106b27d 100644 --- a/data/index-management/createSearchIndexes.json +++ b/data/index-management/createSearchIndexes.json @@ -33,7 +33,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/index-management/dropSearchIndex.json b/data/index-management/dropSearchIndex.json index c7569259c4..d8957a2227 100644 --- a/data/index-management/dropSearchIndex.json +++ b/data/index-management/dropSearchIndex.json @@ -33,7 +33,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/index-management/listSearchIndexes.json b/data/index-management/listSearchIndexes.json index 591b670d66..a8cef42f7a 100644 --- a/data/index-management/listSearchIndexes.json +++ b/data/index-management/listSearchIndexes.json @@ -33,7 +33,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/index-management/searchIndexIgnoresReadWriteConcern.json b/data/index-management/searchIndexIgnoresReadWriteConcern.json index 979313dc50..47b4ccfa79 100644 --- a/data/index-management/searchIndexIgnoresReadWriteConcern.json +++ b/data/index-management/searchIndexIgnoresReadWriteConcern.json @@ -37,7 +37,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/index-management/updateSearchIndex.json b/data/index-management/updateSearchIndex.json index 76ee373af0..76a5962146 100644 --- a/data/index-management/updateSearchIndex.json +++ b/data/index-management/updateSearchIndex.json @@ -33,7 +33,8 @@ "replicaset", "load-balanced", "sharded" - ] + ], + "serverless": "forbid" } ], "tests": [ diff --git a/data/retryable-reads/unified/handshakeError.json b/data/retryable-reads/unified/handshakeError.json index 6a2ea81714..2921d8a954 100644 --- a/data/retryable-reads/unified/handshakeError.json +++ b/data/retryable-reads/unified/handshakeError.json @@ -429,6 +429,11 @@ }, { "description": "client.createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -523,6 +528,11 @@ }, { "description": "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -617,6 +627,11 @@ }, { "description": "database.aggregate succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -717,6 +732,11 @@ }, { "description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -1189,6 +1209,11 @@ }, { "description": "database.createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -1283,6 +1308,11 @@ }, { "description": "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -2849,6 +2879,11 @@ }, { "description": "collection.createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -2943,6 +2978,11 @@ }, { "description": "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", diff --git a/data/transactions/legacy/error-labels-errorLabels.json b/data/transactions/legacy/error-labels-errorLabels.json index 795c54ea9c..50d90c36f8 100644 --- a/data/transactions/legacy/error-labels-errorLabels.json +++ b/data/transactions/legacy/error-labels-errorLabels.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/error-labels.json b/data/transactions/legacy/error-labels.json index 646e1b63f8..ac1265517f 100644 --- a/data/transactions/legacy/error-labels.json +++ b/data/transactions/legacy/error-labels.json @@ -11,7 +11,8 @@ "topology": [ "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-pin-auto.json b/data/transactions/legacy/mongos-pin-auto.json index f6ede52687..037f212f49 100644 --- a/data/transactions/legacy/mongos-pin-auto.json +++ b/data/transactions/legacy/mongos-pin-auto.json @@ -4,7 +4,8 @@ "minServerVersion": "4.1.8", "topology": [ "sharded" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-recovery-token-errorLabels.json b/data/transactions/legacy/mongos-recovery-token-errorLabels.json index ad943155d6..874dae2f69 100644 --- a/data/transactions/legacy/mongos-recovery-token-errorLabels.json +++ b/data/transactions/legacy/mongos-recovery-token-errorLabels.json @@ -5,7 +5,8 @@ "topology": [ "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/mongos-recovery-token.json b/data/transactions/legacy/mongos-recovery-token.json index 0a6e72877f..3be3857ddd 100644 --- a/data/transactions/legacy/mongos-recovery-token.json +++ b/data/transactions/legacy/mongos-recovery-token.json @@ -5,7 +5,8 @@ "topology": [ "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/pin-mongos.json b/data/transactions/legacy/pin-mongos.json index e0f3a880bd..485a3d9322 100644 --- a/data/transactions/legacy/pin-mongos.json +++ b/data/transactions/legacy/pin-mongos.json @@ -4,7 +4,8 @@ "minServerVersion": "4.1.8", "topology": [ "sharded" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json index 9b3b732c15..bf65ed6eab 100644 --- a/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json +++ b/data/transactions/legacy/retryable-commit-errorLabels-forbid_serverless.json @@ -6,7 +6,8 @@ "replicaset", "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/legacy/retryable-commit-forbid_serverless.json b/data/transactions/legacy/retryable-commit-forbid_serverless.json index 93330c66a7..374f18d7ef 100644 --- a/data/transactions/legacy/retryable-commit-forbid_serverless.json +++ b/data/transactions/legacy/retryable-commit-forbid_serverless.json @@ -11,7 +11,8 @@ "topology": [ "sharded", "load-balanced" - ] + ], + "serverless": "forbid" } ], "database_name": "transaction-tests", diff --git a/data/transactions/unified/mongos-unpin.json b/data/transactions/unified/mongos-unpin.json index f30e818646..356f4fd9b8 100644 --- a/data/transactions/unified/mongos-unpin.json +++ b/data/transactions/unified/mongos-unpin.json @@ -50,6 +50,11 @@ "tests": [ { "description": "unpin after TransientTransactionError error on commit", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "startTransaction", @@ -156,6 +161,11 @@ }, { "description": "unpin after non-transient error on abort", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "startTransaction", diff --git a/data/transactions/unified/retryable-abort-handshake.json b/data/transactions/unified/retryable-abort-handshake.json index 9ace3ecb37..4ad56e2f2f 100644 --- a/data/transactions/unified/retryable-abort-handshake.json +++ b/data/transactions/unified/retryable-abort-handshake.json @@ -9,6 +9,7 @@ "sharded", "load-balanced" ], + "serverless": "forbid", "auth": true } ], diff --git a/data/transactions/unified/retryable-commit-handshake.json b/data/transactions/unified/retryable-commit-handshake.json index 35d6d28979..d9315a8fc6 100644 --- a/data/transactions/unified/retryable-commit-handshake.json +++ b/data/transactions/unified/retryable-commit-handshake.json @@ -9,6 +9,7 @@ "sharded", "load-balanced" ], + "serverless": "forbid", "auth": true } ], diff --git a/data/unified-format/valid-pass/poc-change-streams.json b/data/unified-format/valid-pass/poc-change-streams.json index 2b6f2f0154..4194005eb4 100644 --- a/data/unified-format/valid-pass/poc-change-streams.json +++ b/data/unified-format/valid-pass/poc-change-streams.json @@ -1,6 +1,11 @@ { "description": "poc-change-streams", "schemaVersion": "1.4", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "createEntities": [ { "client": { diff --git a/data/unified-format/valid-pass/poc-crud.json b/data/unified-format/valid-pass/poc-crud.json index 91932b9aed..94e4ec5682 100644 --- a/data/unified-format/valid-pass/poc-crud.json +++ b/data/unified-format/valid-pass/poc-crud.json @@ -323,7 +323,8 @@ "topologies": [ "replicaset", "sharded" - ] + ], + "serverless": "forbid" } ], "operations": [ @@ -408,7 +409,8 @@ "description": "Aggregate with $listLocalSessions", "runOnRequirements": [ { - "minServerVersion": "3.6.0" + "minServerVersion": "3.6.0", + "serverless": "forbid" } ], "operations": [ diff --git a/data/versioned-api/crud-api-version-1-strict.json b/data/versioned-api/crud-api-version-1-strict.json index e9c7764d64..c1c8ecce01 100644 --- a/data/versioned-api/crud-api-version-1-strict.json +++ b/data/versioned-api/crud-api-version-1-strict.json @@ -141,6 +141,11 @@ }, { "description": "aggregate on database appends declared API version", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "aggregate", diff --git a/data/versioned-api/crud-api-version-1.json b/data/versioned-api/crud-api-version-1.json index 509d07d9b7..a387d0587e 100644 --- a/data/versioned-api/crud-api-version-1.json +++ b/data/versioned-api/crud-api-version-1.json @@ -141,6 +141,11 @@ }, { "description": "aggregate on database appends declared API version", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "aggregate", diff --git a/data/versioned-api/test-commands-strict-mode.json b/data/versioned-api/test-commands-strict-mode.json index 7f5ebe8f67..9c4ebea785 100644 --- a/data/versioned-api/test-commands-strict-mode.json +++ b/data/versioned-api/test-commands-strict-mode.json @@ -6,7 +6,8 @@ "minServerVersion": "4.9", "serverParameters": { "enableTestCommands": true - } + }, + "serverless": "forbid" } ], "createEntities": [