Skip to content

Ensure TimeoutContext is present for a subsequent commit operation. #1376

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

Merged
merged 2 commits into from
May 2, 2024
Merged

Ensure TimeoutContext is present for a subsequent commit operation. #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a8a674
Ensure TimeoutContext is present for a second commit transaction oper…
vbabanin May 1, 2024
2ae6815
Uncomment tests.
vbabanin May 2, 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
1 change: 0 additions & 1 deletion driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ private void commitTransaction(final boolean resetTimeout) {
.execute(new CommitTransactionOperation(writeConcern,
transactionState == TransactionState.COMMITTED)
.recoveryToken(getRecoveryToken()), readConcern, this);
setTimeoutContext(null);
}
} catch (MongoException e) {
clearTransactionContextOnError(e);
Expand Down
11 changes: 8 additions & 3 deletions .../src/test/functional/com/mongodb/client/AbstractClientSideOperationsTimeoutProseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.Tag;
Expand Down Expand Up @@ -713,7 +712,6 @@ public void test10CustomTestWithTransactionUsesASingleTimeoutWithLock() {
@Tag("setsFailPoint")
@Test
@DisplayName("Should ignore wTimeoutMS of WriteConcern to initial and subsequent commitTransaction operations")
@Disabled //TODO JAVA-5425
public void shouldIgnoreWtimeoutMsOfWriteConcernToInitialAndSubsequentCommitTransactionOperations() {
assumeTrue(serverVersionAtLeast(4, 4));
assumeFalse(isStandalone());
Expand All @@ -738,7 +736,14 @@ public void shouldIgnoreWtimeoutMsOfWriteConcernToInitialAndSubsequentCommitTran
}
List<CommandStartedEvent> commandStartedEvents = commandListener.getCommandStartedEvents("commitTransaction");
assertEquals(2, commandStartedEvents.size());
commandStartedEvents.forEach(e -> assertFalse(e.getCommand().containsKey("writeConcern")));

commandStartedEvents.forEach(e -> {
BsonDocument command = e.getCommand();
if (command.containsKey("writeConcern")) {
BsonDocument writeConcern = command.getDocument("writeConcern");
assertFalse(writeConcern.isEmpty());
assertFalse(writeConcern.containsKey("wTimeoutMS"));
}});
}

private static Stream<Arguments> test8ServerSelectionArguments() {
Expand Down
6 changes: 0 additions & 6 deletions driver-sync/src/test/functional/com/mongodb/client/ClientSideOperationTimeoutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@ public static void checkSkipCSOTTest(final String fileDescription, final String
&& testDescription.equals("timeoutMS can be overridden for close"));

assumeFalse("TODO (CSOT) - JAVA-5259 No client.withTimeout", testDescription.endsWith("on client"));

assumeFalse("TODO (CSOT) - JAVA-4052", fileDescription.startsWith("timeoutMS behaves correctly for retryable operations"));
assumeFalse("TODO (CSOT) - JAVA-4052", fileDescription.startsWith("legacy timeouts behave correctly for retryable operations"));

assumeFalse("TODO (CSOT) - JAVA-4062", testDescription.contains("wTimeoutMS is ignored")
|| testDescription.contains("ignores wTimeoutMS"));
}

private static final List<String> RACY_GET_MORE_TESTS = asList(
Expand Down