Skip to content

fix: enableGreenNodeReplacement being ignored #1065

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
Jul 19, 2024
Merged

fix: enableGreenNodeReplacement being ignored #1065

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
19 changes: 7 additions & 12 deletions wrapper/src/main/java/software/amazon/jdbc/DataSourceConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,6 @@ public Connection connect(
LOGGER.finest(() -> "Use a separate DataSource object to create a connection.");
// use a new data source instance to instantiate a connection
final DataSource ds = createDataSource();
targetDriverDialect.prepareDataSource(
ds,
protocol,
hostSpec,
copy);
conn = this.openConnection(ds, protocol, targetDriverDialect, hostSpec, copy);

} else {
Expand All @@ -145,11 +140,6 @@ public Connection connect(
this.lock.lock();
LOGGER.finest(() -> "Use main DataSource object to create a connection.");
try {
targetDriverDialect.prepareDataSource(
this.dataSource,
protocol,
hostSpec,
copy);
conn = this.openConnection(this.dataSource, protocol, targetDriverDialect, hostSpec, copy);
} finally {
this.lock.unlock();
Expand All @@ -170,11 +160,16 @@ protected Connection openConnection(
final @NonNull HostSpec hostSpec,
final @NonNull Properties props)
throws SQLException {

final boolean enableGreenNodeReplacement = PropertyDefinition.ENABLE_GREEN_NODE_REPLACEMENT.getBoolean(props);
try {
targetDriverDialect.prepareDataSource(
ds,
protocol,
hostSpec,
props);
return ds.getConnection();
} catch (Throwable throwable) {
if (!PropertyDefinition.ENABLE_GREEN_NODE_REPLACEMENT.getBoolean(props)) {
if (!enableGreenNodeReplacement) {
throw throwable;
}

Expand Down