Skip to content

Fix flaky test #JAVA-6016 #1845

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
strogiyotec merged 2 commits into from
Dec 2, 2025
Merged

Fix flaky test #JAVA-6016 #1845

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
cf80240
Fix flaky test #JAVA-6016
Nov 30, 2025
6f2999b
remove unused import
Dec 1, 2025
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
10 changes: 8 additions & 2 deletions driver-core/src/main/com/mongodb/internal/connection/CommandHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import com.mongodb.ServerApi;
import com.mongodb.connection.ClusterConnectionMode;
import com.mongodb.internal.TimeoutContext;
import com.mongodb.internal.VisibleForTesting;

import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;

import com.mongodb.internal.async.SingleResultCallback;
import com.mongodb.internal.validator.NoOpFieldNameValidator;
import com.mongodb.lang.Nullable;
Expand All @@ -38,8 +42,10 @@
*/
public final class CommandHelper {

static final String HELLO = "hello";
static final String LEGACY_HELLO = "isMaster";
@VisibleForTesting(otherwise = PRIVATE)
public static final String HELLO = "hello";
@VisibleForTesting(otherwise = PRIVATE)
public static final String LEGACY_HELLO = "isMaster";
static final String LEGACY_HELLO_LOWER = LEGACY_HELLO.toLowerCase(Locale.ROOT);

static BsonDocument executeCommand(final String database, final BsonDocument command, final ClusterConnectionMode clusterConnectionMode,
Expand Down
16 changes: 13 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 @@ -47,6 +47,10 @@
import com.mongodb.event.ConnectionClosedEvent;
import com.mongodb.event.ConnectionCreatedEvent;
import com.mongodb.event.ConnectionReadyEvent;

import static com.mongodb.internal.connection.CommandHelper.HELLO;
import static com.mongodb.internal.connection.CommandHelper.LEGACY_HELLO;

import com.mongodb.internal.connection.InternalStreamConnection;
import com.mongodb.internal.connection.ServerHelper;
import com.mongodb.internal.connection.TestCommandListener;
Expand Down Expand Up @@ -1051,8 +1055,7 @@ public void shouldUseConnectTimeoutMsWhenEstablishingConnectionInBackground() {
} finally {
InternalStreamConnection.setRecordEverything(false);
}

List<CommandFailedEvent> commandFailedEvents = commandListener.getCommandFailedEvents("isMaster");
List<CommandFailedEvent> commandFailedEvents = commandListener.getCommandFailedEvents(getHandshakeCommandName());
assertFalse(commandFailedEvents.isEmpty());
assertInstanceOf(MongoOperationTimeoutException.class, commandFailedEvents.get(0).getThrowable());
}
Expand Down Expand Up @@ -1136,8 +1139,15 @@ private MongoClient createMongoClient(final MongoClientSettings.Builder builder)
return createMongoClient(builder.build());
}

private long msElapsedSince(final long t1) {
private long msElapsedSince(final long t1) {
return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1);
}

/**
* Get the handshake command name based on the server API version.
* @return the handshake command name
*/
private String getHandshakeCommandName() {
return ClusterFixture.getServerApi() == null ? LEGACY_HELLO : HELLO;
}
}