Skip to content

fix: pass in a copy of shared connection properties in reader failover #436

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 2 commits into from
May 10, 2023
Merged

fix: pass in a copy of shared connection properties in reader failover #436

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
af88308
fix: pass in a copy of shared connection properties in reader failover
karenc-bq May 10, 2023
162106c
fix: checkstyle
karenc-bq May 10, 2023
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
5 changes: 2 additions & 3 deletions wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ public Connection connect(
}
}

LOGGER.finest(() -> "Connecting to " + urlBuilder);
LOGGER.finest(() -> PropertyUtils.logProperties(props, "Connecting with properties: \n"));

LOGGER.finest(() -> "Connecting to " + urlBuilder
+ PropertyUtils.logProperties(props, "\nwith properties: \n"));
return this.driver.connect(urlBuilder.toString(), props);
}

Expand Down
5 changes: 3 additions & 2 deletions ...src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,11 @@ public ReaderFailoverResult call() {
LOGGER.fine(
() -> Messages.get(
"ClusterAwareReaderFailoverHandler.attemptingReaderConnection",
new Object[] {this.newHost.getUrl()}));
new Object[] {this.newHost.getUrl(), initialConnectionProps}));

try {
final Connection conn = pluginService.forceConnect(this.newHost, initialConnectionProps);
final Properties copy = new Properties(initialConnectionProps);
final Connection conn = pluginService.forceConnect(this.newHost, copy);
pluginService.setAvailability(this.newHost.asAliases(), HostAvailability.AVAILABLE);
LOGGER.fine(
() -> Messages.get(
Expand Down
2 changes: 1 addition & 1 deletion wrapper/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ AwsWrapperDataSource.missingDriver=Can't find a suitable driver for ''{0}''

# Cluster Aware Reader Failover Handler
ClusterAwareReaderFailoverHandler.interruptedThread=Thread was interrupted.
ClusterAwareReaderFailoverHandler.attemptingReaderConnection=Trying to connect to reader: ''{0}''
ClusterAwareReaderFailoverHandler.attemptingReaderConnection=Trying to connect to reader: ''{0}'', with properties ''{1}''
ClusterAwareReaderFailoverHandler.successfulReaderConnection=Connected to reader: ''{0}''
ClusterAwareReaderFailoverHandler.failedReaderConnection=Failed to connect to reader: ''{0}''
ClusterAwareReaderFailoverHandler.invalidTopology=''{0}'' was called with an invalid (null or empty) topology.
Expand Down