Skip to content

fix: prune null connections in the connection tracker #461

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
karenc-bq merged 1 commit into from
Jun 5, 2023
Merged

fix: prune null connections in the connection tracker #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraConnectionTrackerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
import software.amazon.jdbc.JdbcCallable;
import software.amazon.jdbc.NodeChangeOptions;
import software.amazon.jdbc.PluginService;
import software.amazon.jdbc.cleanup.CanReleaseResources;
import software.amazon.jdbc.plugin.failover.FailoverSQLException;
import software.amazon.jdbc.util.RdsUrlType;
import software.amazon.jdbc.util.RdsUtils;
import software.amazon.jdbc.util.SubscribedMethodHelper;

public class AuroraConnectionTrackerPlugin extends AbstractConnectionPlugin {
public class AuroraConnectionTrackerPlugin extends AbstractConnectionPlugin implements
CanReleaseResources {

static final String METHOD_ABORT = "Connection.abort";
static final String METHOD_CLOSE = "Connection.close";
Expand Down Expand Up @@ -147,6 +149,11 @@ public void notifyNodeListChanged(final Map<String, EnumSet<NodeChangeOptions>>
}
}

@Override
public void releaseResources() {
tracker.pruneNullConnections();
}

private HostSpec getWriter(final @NonNull List<HostSpec> hosts) {
for (final HostSpec hostSpec : hosts) {
if (hostSpec.getRole() == HostRole.WRITER) {
Expand Down
6 changes: 6 additions & 0 deletions wrapper/src/main/java/software/amazon/jdbc/plugin/OpenedConnectionTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,10 @@ private void logConnectionQueue(final String host, final Queue<WeakReference<Con
builder.append("\n]");
LOGGER.finest(Messages.get("OpenedConnectionTracker.invalidatingConnections", new Object[] {builder.toString()}));
}

public void pruneNullConnections() {
openedConnections.forEach((key, queue) -> {
queue.removeIf(connectionWeakReference -> Objects.equals(connectionWeakReference.get(), null));
});
}
}