-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Do not perform server selection to determine sessions support #1092
Merged
Conversation
This file contains 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
Instead, check for session support during operation execution after the connection is checked out. JAVA-4860
jyemin
commented
Mar 2, 2023
@@ -221,8 +221,14 @@ private List<BsonElement> getExtraElements(final SessionContext sessionContext) | |||
if (sessionContext.getClusterTime() != null) { | |||
extraElements.add(new BsonElement("$clusterTime", sessionContext.getClusterTime())); | |||
} | |||
if (sessionContext.hasSession() && responseExpected) { | |||
extraElements.add(new BsonElement("lsid", sessionContext.getSessionId())); | |||
if (sessionContext.hasSession()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is really the crux of the whole change. A few notes:
- All application-initiated messages now have a session, so the only time this is false is for SDAM-related connection
- This seems a bit late to be checking for unsupported explicit sessions, but it's the only place to put it that wouldn't result in code duplication, since sync and async paths all end up here
- In practice, almost every server that the driver could actually connect to (3.6+) supports sessions, so the only time
isSessionSupported
will return false is a 3.6 server in 3.4 FCV mode, or a mongocryptd server.
driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
Show resolved
Hide resolved
driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
rozza
approved these changes
Mar 3, 2023
katcharov
requested changes
Mar 3, 2023
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
katcharov
approved these changes
Mar 8, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
driver-sync/src/test/functional/com/mongodb/client/AbstractSessionsProseTest.java
Show resolved
Hide resolved
jyemin
commented
Mar 8, 2023
...active-streams/src/main/com/mongodb/reactivestreams/client/internal/ClientSessionHelper.java
Show resolved
Hide resolved
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.
Instead, check for session support during operation execution after the connection is checked out.
JAVA-4860