From 681440ae6464ae922747d67a9e9cf787ac740bcf Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Thu, 29 Oct 2026 11:13:34 -0400 Subject: [PATCH 1/3] DRIVERS-3659 Specify that failpoints in unified tests must not be configured through clients with timeout options --- .../tests/unified/error-labels-blockConnection.json | 8 +++++++- .../tests/unified/error-labels-blockConnection.yml | 6 +++++- source/unified-test-format/unified-test-format.md | 7 +++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/source/transactions/tests/unified/error-labels-blockConnection.json b/source/transactions/tests/unified/error-labels-blockConnection.json index 8da04d1005..60d753edce 100644 --- a/source/transactions/tests/unified/error-labels-blockConnection.json +++ b/source/transactions/tests/unified/error-labels-blockConnection.json @@ -12,6 +12,12 @@ } ], "createEntities": [ + { + "client": { + "id": "failPointClient", + "useMultipleMongoses": false + } + }, { "client": { "id": "client0", @@ -60,7 +66,7 @@ "object": "testRunner", "name": "failPoint", "arguments": { - "client": "client0", + "client": "failPointClient", "failPoint": { "configureFailPoint": "failCommand", "mode": { diff --git a/source/transactions/tests/unified/error-labels-blockConnection.yml b/source/transactions/tests/unified/error-labels-blockConnection.yml index 7fed7fc92b..132c908a50 100644 --- a/source/transactions/tests/unified/error-labels-blockConnection.yml +++ b/source/transactions/tests/unified/error-labels-blockConnection.yml @@ -17,6 +17,10 @@ runOnRequirements: - load-balanced createEntities: + - + client: + id: &failPointClient failPointClient + useMultipleMongoses: false - client: id: &client0 client0 @@ -60,7 +64,7 @@ tests: object: testRunner name: failPoint arguments: - client: *client0 + client: *failPointClient failPoint: # Drivers stop retrying after two socket timeouts that occur due to the use of socketTimeoutMS configureFailPoint: failCommand diff --git a/source/unified-test-format/unified-test-format.md b/source/unified-test-format/unified-test-format.md index 1c28c46058..fd604dbad9 100644 --- a/source/unified-test-format/unified-test-format.md +++ b/source/unified-test-format/unified-test-format.md @@ -2002,6 +2002,11 @@ The following arguments are supported: lead to unpredictable behavior if different servers were selected for configuring the fail point and executing subsequent operations. + When configuring a fail point, tests MUST NOT use a client entity that specifies timeout options such as `timeoutMS` + or `socketTimeoutMS` in `uriOptions`. Since the test runner disables the fail point using the same client after the + test, short timeouts can cause the cleanup to fail intermittently. Tests that need a client with timeout options + MUST configure the fail point using a separate client entity without them. + When executing this operation, the test runner MUST keep a record of the fail point so that it can be disabled after the test. The test runner MUST also ensure that the `configureFailPoint` command is excluded from the list of observed command monitoring events for this client (if applicable). @@ -3470,6 +3475,8 @@ other specs *and* collating spec changes developed in parallel or during the sam ## Changelog +- 2026-10-29: Require that fail points not be configured through clients with timeout options. + - 2026-08-26: **Schema version 1.29.** Introduced the `$$gte` operator, the lower-bound counterpart to `$$lte`. Also clarified that `ignoreExtraSpans` From 9501f687fc85a01db524a87dde6256af3504365f Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 3 Nov 2026 15:11:45 -0500 Subject: [PATCH 2/3] Remove CSOT reference and clarify audience of requirement --- source/unified-test-format/unified-test-format.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/unified-test-format/unified-test-format.md b/source/unified-test-format/unified-test-format.md index fd604dbad9..03980cdfd5 100644 --- a/source/unified-test-format/unified-test-format.md +++ b/source/unified-test-format/unified-test-format.md @@ -2002,8 +2002,8 @@ The following arguments are supported: lead to unpredictable behavior if different servers were selected for configuring the fail point and executing subsequent operations. - When configuring a fail point, tests MUST NOT use a client entity that specifies timeout options such as `timeoutMS` - or `socketTimeoutMS` in `uriOptions`. Since the test runner disables the fail point using the same client after the + When configuring a fail point, test authors MUST NOT use a client entity that specifies timeout options such as + `socketTimeoutMS` in `uriOptions`. Since the test runner disables the fail point using the same client after the test, short timeouts can cause the cleanup to fail intermittently. Tests that need a client with timeout options MUST configure the fail point using a separate client entity without them. From 1b5fe289f6fbd8765bc25b7098b67b1b06f78d89 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Fri, 6 Nov 2026 12:11:44 -0500 Subject: [PATCH 3/3] Update wording --- source/unified-test-format/unified-test-format.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/unified-test-format/unified-test-format.md b/source/unified-test-format/unified-test-format.md index 03980cdfd5..69df90b12d 100644 --- a/source/unified-test-format/unified-test-format.md +++ b/source/unified-test-format/unified-test-format.md @@ -2002,7 +2002,7 @@ The following arguments are supported: lead to unpredictable behavior if different servers were selected for configuring the fail point and executing subsequent operations. - When configuring a fail point, test authors MUST NOT use a client entity that specifies timeout options such as + When configuring a fail point, a test MUST NOT use a client entity that specifies timeout options such as `socketTimeoutMS` in `uriOptions`. Since the test runner disables the fail point using the same client after the test, short timeouts can cause the cleanup to fail intermittently. Tests that need a client with timeout options MUST configure the fail point using a separate client entity without them.