Skip to content
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

Jump to bottom

Verify plugin presence based on actual plugin list #1141

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Verify plugin presence based on actual plugin list #1141

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
2 changes: 2 additions & 0 deletions wrapper/src/main/java/software/amazon/jdbc/PluginService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,6 @@ HostSpec getHostSpecByStrategy(List<HostSpec> hosts, HostRole role, String strat
String getTargetName();

@NonNull SessionStateService getSessionStateService();

<T> T getPlugin(final Class<T> pluginClazz);
}
9 changes: 9 additions & 0 deletions wrapper/src/main/java/software/amazon/jdbc/PluginServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,4 +689,13 @@ public String getTargetName() {
public @NonNull SessionStateService getSessionStateService() {
return this.sessionStateService;
}

public <T> T getPlugin(final Class<T> pluginClazz) {
for (ConnectionPlugin p : this.pluginManager.plugins) {
if (pluginClazz.isAssignableFrom(p.getClass())) {
return pluginClazz.cast(p);
}
}
return null;
}
}
6 changes: 3 additions & 3 deletions wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraMysqlDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import java.sql.Statement;
import java.util.Collections;
import java.util.List;
import software.amazon.jdbc.ConnectionPluginChainBuilder;
import software.amazon.jdbc.hostlistprovider.AuroraHostListProvider;
import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsHostListProvider;
import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;

public class AuroraMysqlDialect extends MysqlDialect {

Expand Down Expand Up @@ -83,9 +83,9 @@ public boolean isDialect(final Connection connection) {
public HostListProviderSupplier getHostListProvider() {
return (properties, initialUrl, hostListProviderService, pluginService) -> {

final List<String> plugins = ConnectionPluginChainBuilder.getPluginCodes(properties);
final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);

if (plugins.contains("failover2")) {
if (failover2Plugin != null) {
return new MonitoringRdsHostListProvider(
properties,
initialUrl,
Expand Down
7 changes: 3 additions & 4 deletions wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.logging.Logger;
import software.amazon.jdbc.ConnectionPluginChainBuilder;
import software.amazon.jdbc.hostlistprovider.AuroraHostListProvider;
import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsHostListProvider;
import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;

/**
* Suitable for the following AWS PG configurations.
Expand Down Expand Up @@ -128,9 +127,9 @@ public boolean isDialect(final Connection connection) {
public HostListProviderSupplier getHostListProvider() {
return (properties, initialUrl, hostListProviderService, pluginService) -> {

final List<String> plugins = ConnectionPluginChainBuilder.getPluginCodes(properties);
final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);

if (plugins.contains("failover2")) {
if (failover2Plugin != null) {
return new MonitoringRdsHostListProvider(
properties,
initialUrl,
Expand Down
6 changes: 3 additions & 3 deletions wrapper/src/main/java/software/amazon/jdbc/dialect/RdsMultiAzDbClusterMysqlDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
import java.util.List;
import java.util.Properties;
import org.checkerframework.checker.nullness.qual.NonNull;
import software.amazon.jdbc.ConnectionPluginChainBuilder;
import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.hostlistprovider.RdsMultiAzDbClusterListProvider;
import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsMultiAzHostListProvider;
import software.amazon.jdbc.plugin.failover.FailoverRestriction;
import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
import software.amazon.jdbc.util.DriverInfo;

public class RdsMultiAzDbClusterMysqlDialect extends MysqlDialect {
Expand Down Expand Up @@ -98,9 +98,9 @@ public boolean isDialect(final Connection connection) {
public HostListProviderSupplier getHostListProvider() {
return (properties, initialUrl, hostListProviderService, pluginService) -> {

final List<String> plugins = ConnectionPluginChainBuilder.getPluginCodes(properties);
final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);

if (plugins.contains("failover2")) {
if (failover2Plugin != null) {
return new MonitoringRdsMultiAzHostListProvider(
properties,
initialUrl,
Expand Down
7 changes: 4 additions & 3 deletions wrapper/src/main/java/software/amazon/jdbc/dialect/RdsMultiAzDbClusterPgDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
import java.sql.Statement;
import java.util.List;
import java.util.logging.Logger;
import software.amazon.jdbc.ConnectionPluginChainBuilder;
import software.amazon.jdbc.exceptions.ExceptionHandler;
import software.amazon.jdbc.exceptions.MultiAzDbClusterPgExceptionHandler;
import software.amazon.jdbc.hostlistprovider.RdsMultiAzDbClusterListProvider;
import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsMultiAzHostListProvider;
import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
import software.amazon.jdbc.util.DriverInfo;

public class RdsMultiAzDbClusterPgDialect extends PgDialect {
Expand Down Expand Up @@ -113,9 +113,10 @@ public boolean isDialect(final Connection connection) {
@Override
public HostListProviderSupplier getHostListProvider() {
return (properties, initialUrl, hostListProviderService, pluginService) -> {
final List<String> plugins = ConnectionPluginChainBuilder.getPluginCodes(properties);

if (plugins.contains("failover2")) {
final FailoverConnectionPlugin failover2Plugin = pluginService.getPlugin(FailoverConnectionPlugin.class);

if (failover2Plugin != null) {
return new MonitoringRdsMultiAzHostListProvider(
properties,
initialUrl,
Expand Down
1 change: 1 addition & 0 deletions wrapper/src/test/java/software/amazon/jdbc/DialectDetectionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void setUp() throws SQLException {
when(this.mockConnection.createStatement()).thenReturn(this.mockStatement);
when(this.mockHost.getUrl()).thenReturn("url");
when(this.failResultSet.next()).thenReturn(false);
pluginManager.plugins = new ArrayList<>();
}

@AfterEach
Expand Down
5 changes: 5 additions & 0 deletions wrapper/src/test/java/software/amazon/jdbc/plugin/efm/ConcurrencyTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,11 @@ public String getTargetName() {
return new TestSessionStateService();
}

@Override
public <T> T getPlugin(Class<T> pluginClazz) {
return null;
}

@Override
public boolean isNetworkException(Throwable throwable) {
return false;
Expand Down
Loading