Skip to content
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.

Sign up for GitHub

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

feat(NODE-6231): Add CSOT behaviour for retryable reads and writes #4186

Merged
merged 13 commits into from
Aug 1, 2024
Merged

feat(NODE-6231): Add CSOT behaviour for retryable reads and writes #4186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f160cd4
Add CSOT infinite retry
W-A-James Jul 29, 2024
c87e5ab
Add comment to update test runner in NODE-6274
W-A-James Jul 29, 2024
132674f
skip test with comment
W-A-James Jul 29, 2024
1a4feab
Add logic to reset server selection timeout for retry
W-A-James Jul 29, 2024
ce50731
add new tests
W-A-James Jul 29, 2024
5505c68
remove unused import
W-A-James Jul 29, 2024
27f6b50
restore previous timeout behaviour
W-A-James Jul 30, 2024
c38de6f
fix spec unit test
W-A-James Jul 30, 2024
bd3dbe1
style
W-A-James Jul 30, 2024
23fb782
test cleanup and skip retryable writes tests on standalone
W-A-James Jul 30, 2024
eab4240
construct clients from test config
W-A-James Jul 30, 2024
5d72bda
remove duplicate tests
W-A-James Jul 30, 2024
cbce285
improve error message
W-A-James Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add CSOT infinite retry
  • Loading branch information
@W-A-James
W-A-James committed Jul 29, 2024
commit f160cd47902f9036ade9e872dd73d9d66a67ac86
9 changes: 5 additions & 4 deletions src/operations/execute_operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,10 @@ async function tryOperation<
session.incrementTransactionNumber();
}

// TODO(NODE-6231): implement infinite retry within CSOT timeout here
const maxTries = willRetry ? 2 : 1;
const maxTries = willRetry ? (timeoutContext.csotEnabled() ? Infinity : 2) : 1;
let previousOperationError: MongoError | undefined;
let previousServer: ServerDescription | undefined;

// TODO(NODE-6231): implement infinite retry within CSOT timeout here
for (let tries = 0; tries < maxTries; tries++) {
if (previousOperationError) {
if (hasWriteAspect && previousOperationError.code === MMAPv1_RETRY_WRITES_ERROR_CODE) {
Expand Down Expand Up @@ -277,7 +275,6 @@ async function tryOperation<
return await operation.execute(server, session, timeoutContext);
} catch (operationError) {
if (!(operationError instanceof MongoError)) throw operationError;

if (
previousOperationError != null &&
operationError.hasErrorLabel(MongoErrorLabel.NoWritesPerformed)
Expand All @@ -286,6 +283,10 @@ async function tryOperation<
}
previousServer = server.description;
previousOperationError = operationError;

// Reset timeouts
timeoutContext.serverSelectionTimeout?.clear();
timeoutContext.connectionCheckoutTimeout?.clear();
Comment on lines +288 to +289
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clear timeouts to ensure correct setting of the serverSelectionTimeoutMS value

}
}

Expand Down
4 changes: 3 additions & 1 deletion test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
const enabled = [
'override-collection-timeoutMS',
'override-database-timeoutMS',
'override-operation-timeoutMS'
'override-operation-timeoutMS',
'retryability-legacy-timeouts',
'retryability-timeoutMS'
];

const cursorOperations = [
Expand Down