Ignore maxWaitTime when CSOT is enabled.#1744
Merged
vbabanin merged 10 commits intomongodb:mainfrom Aug 19, 2025
Merged
Conversation
katcharov
requested review from
a team,
nhachicha and
stIncMale
and removed request for
a team and
nhachicha
stIncMale
requested changes
Jun 24, 2025
driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
Outdated
Show resolved
Hide resolved
driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
Outdated
Show resolved
Hide resolved
driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
Outdated
Show resolved
Hide resolved
driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
Outdated
Show resolved
Hide resolved
...ync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
Show resolved
Hide resolved
driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
Outdated
Show resolved
Hide resolved
...ync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
Show resolved
Hide resolved
...ync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
Outdated
Show resolved
Hide resolved
...ync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
Outdated
Show resolved
Hide resolved
Add JavaDoc to StartTime. Shutdown executor properly.
stIncMale
requested changes
Jul 25, 2025
...ync/src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
Outdated
Show resolved
Hide resolved
Member
|
The last reviewed commit is 820b131. |
…entSideOperationsTimeoutProseTest.java Co-authored-by: Valentin Kovalenko <valentin.male.kovalenko@gmail.com>
# Conflicts: # driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java DRIVERS-2985: Allow on-demand client metadata updates after MongoClient initialization. (mongodb#1798)
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR implements the functionality to ignore maxWaitTime connection pool setting when Client-Side Operation Timeout (CSOT) is enabled, meaning when timeoutMS is set. When CSOT is active, the operation timeout takes precedence over the connection pool's maximum wait time.
Key changes:
- Modified connection pool logic to use operation timeout instead of maxWaitTime when CSOT is enabled
- Added comprehensive test coverage for the new behavior
- Updated timeout context methods and error handling to support the new timeout precedence
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| AbstractClientSideOperationsTimeoutProseTest.java | Added three new test cases to verify maxWaitTime is ignored when timeoutMS is set |
| ClientSideOperationTimeoutProseTest.java | Updated tearDown method signature to handle InterruptedException |
| DefaultConnectionPoolTest.java | Added test for maxWaitTime behavior and refactored Thread.sleep usage |
| DefaultConnectionPool.java | Core logic change to use operation timeout over maxWaitTime when CSOT is enabled |
| TimeoutContext.java | Modified startMaxWaitTimeout method to return operation timeout when CSOT is active |
| MongoOperationTimeoutException.java | Added @nullable annotation to constructor parameter |
| LogMessage.java | Renamed log field from WAIT_QUEUE_TIMEOUT_MS to MAX_WAIT_TIMEOUT_MS |
| Timeout.java | Added immutability documentation and import ordering fix |
| StartTime.java | Added immutability documentation |
driver-core/src/test/functional/com/mongodb/internal/connection/DefaultConnectionPoolTest.java
Show resolved
Hide resolved
driver-core/src/main/com/mongodb/internal/connection/DefaultConnectionPool.java
Show resolved
Hide resolved
Member
|
The merge diff is so enormous that GitHub fails to correctly display it (even the search box GitHub suggests to use to find the hidden changes does not work). So I used
given that |
stIncMale
approved these changes
Aug 19, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
JAVA-5409