-
Notifications
You must be signed in to change notification settings - Fork 1.5k
CSOT: Network failure handling and session management #1396
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a1f1e61
Fix CSOT issues.
vbabanin b8c5e07
Fix static checks.
vbabanin dd3633d
Merge branch 'CSOT' into JAVA-5474
vbabanin cef088e
Fix static checks
vbabanin 42bf8ee
Disable killCursors unified-tests to be executed in serverless.
vbabanin 83bc9d3
Mark session as dirty in LoadBalanced mode.
vbabanin 8a6199a
Merge branch 'refs/heads/CSOT' into JAVA-5474
vbabanin b8211fe
Add AsyncCommandBatchCursorTest
vbabanin 9d5f7b1
Merge branch 'CSOT' into JAVA-5474
vbabanin 74ce068
Move exception utility method to ExceptionUtils for broader reuse.
vbabanin d5986e5
Address checkstyle errors.
vbabanin 7b0cc82
Merge branch 'CSOT' into JAVA-5474
vbabanin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
35 changes: 35 additions & 0 deletions
35
driver-core/src/main/com/mongodb/internal/connection/AbstractProtocolExecutor.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Copyright 2008-present MongoDB, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.mongodb.internal.connection; | ||
|
||
import com.mongodb.internal.session.SessionContext; | ||
|
||
import static com.mongodb.internal.ExceptionUtils.isMongoSocketException; | ||
import static com.mongodb.internal.ExceptionUtils.isOperationTimeoutFromSocketException; | ||
|
||
/** | ||
* <p>This class is not part of the public API and may be removed or changed at any time</p> | ||
*/ | ||
public abstract class AbstractProtocolExecutor implements ProtocolExecutor { | ||
|
||
protected boolean shouldMarkSessionDirty(final Throwable e, final SessionContext sessionContext) { | ||
if (!sessionContext.hasSession()) { | ||
return false; | ||
} | ||
return isMongoSocketException(e) || isOperationTimeoutFromSocketException(e); | ||
} | ||
} |
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
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
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
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
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
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
Oops, something went wrong.
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.
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.
Does this abstract class need to exist? Can these helper methods just be added to
ProtocolExecutor
?Uh oh!
There was an error while loading. Please reload this page.
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.
Technically, the methods could be moved to the interface since they are stateless, but this would make them public. I've opted to keep them
protected
within the abstract class to maintain better encapsulation and clearer boundaries in the codebase. If you feel that we should move them to the interface, I am open to doing that. Please let me know your thoughts.I've also relocated the
isMongoSocketException
andisOperationTimeoutFromSocketException
toExceptionUtils
for broader reuse.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 all
internal
code, it just adds an extra layer for helper style methods. Looks like this abstract class could be removed andshouldMarkSessionDirty
be moved to a helper.However, if you are keen to keep it protected then its ok with me.