Skip to content

Ensure serverHeartbeatEvent is sent before opening a connection #1715

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 4 commits into from
May 28, 2025
Merged

Ensure serverHeartbeatEvent is sent before opening a connection #1715

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e535a15
Ensure serverHeartbeatEvent is sent before opening a connection
rozza May 22, 2025
5ac6451
Update driver-core/src/test/unit/com/mongodb/internal/connection/Defa…
rozza May 22, 2025
7b73a04
Ensure heartbeatLatch counts down at the end of the event
rozza May 22, 2025
1e9634a
Added disabled test pointing to prose test
rozza May 27, 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
20 changes: 17 additions & 3 deletions driver-core/src/main/com/mongodb/internal/connection/DefaultServerMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.mongodb.event.ServerHeartbeatSucceededEvent;
import com.mongodb.event.ServerMonitorListener;
import com.mongodb.internal.TimeoutContext;
import com.mongodb.internal.VisibleForTesting;
import com.mongodb.internal.diagnostics.logging.Logger;
import com.mongodb.internal.diagnostics.logging.Loggers;
import com.mongodb.internal.inject.Provider;
Expand All @@ -55,6 +56,7 @@
import static com.mongodb.connection.ServerType.UNKNOWN;
import static com.mongodb.internal.Locks.checkedWithLock;
import static com.mongodb.internal.Locks.withLock;
import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
import static com.mongodb.internal.connection.CommandHelper.HELLO;
import static com.mongodb.internal.connection.CommandHelper.LEGACY_HELLO;
import static com.mongodb.internal.connection.CommandHelper.executeCommand;
Expand Down Expand Up @@ -149,8 +151,14 @@ public void cancelCurrentCheck() {
monitor.cancelCurrentCheck();
}

@VisibleForTesting(otherwise = PRIVATE)
ServerMonitor getServerMonitor() {
return monitor;
}

class ServerMonitor extends Thread implements AutoCloseable {
private volatile InternalConnection connection = null;
private volatile boolean alreadyLoggedHeartBeatStarted = false;
private volatile boolean currentCheckCancelled;

ServerMonitor() {
Expand Down Expand Up @@ -213,9 +221,13 @@ public void run() {

private ServerDescription lookupServerDescription(final ServerDescription currentServerDescription) {
try {
boolean shouldStreamResponses = shouldStreamResponses(currentServerDescription);
if (connection == null || connection.isClosed()) {
alreadyLoggedHeartBeatStarted = true;
currentCheckCancelled = false;
InternalConnection newConnection = internalConnectionFactory.create(serverId);
serverMonitorListener.serverHearbeatStarted(new ServerHeartbeatStartedEvent(
newConnection.getDescription().getConnectionId(), shouldStreamResponses));
newConnection.open(operationContextFactory.create());
connection = newConnection;
roundTripTimeSampler.addSample(connection.getInitialServerDescription().getRoundTripTimeNanos());
Expand All @@ -225,9 +237,11 @@ private ServerDescription lookupServerDescription(final ServerDescription curren
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(format("Checking status of %s", serverId.getAddress()));
}
boolean shouldStreamResponses = shouldStreamResponses(currentServerDescription);
serverMonitorListener.serverHearbeatStarted(new ServerHeartbeatStartedEvent(
connection.getDescription().getConnectionId(), shouldStreamResponses));
if (!alreadyLoggedHeartBeatStarted) {
serverMonitorListener.serverHearbeatStarted(new ServerHeartbeatStartedEvent(
connection.getDescription().getConnectionId(), shouldStreamResponses));
}
alreadyLoggedHeartBeatStarted = false;

long start = System.nanoTime();
try {
Expand Down
272 changes: 0 additions & 272 deletions ...re/src/test/unit/com/mongodb/internal/connection/DefaultServerMonitorSpecification.groovy
View file
Open in desktop

This file was deleted.

Loading