refactor: use monitoring RdsHostListProvider by default #1636
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Sophia Chu <112967780+sophia-bq@users.noreply.github.com>
This reverts commit 438ab14.
aaron-congo
changed the title
aaron-congo
commented
Dec 10, 2025
| @EnableOnTestFeature(TestEnvironmentFeatures.NETWORK_OUTAGES_ENABLED) | ||
| @EnableOnNumOfInstances(min = 2) | ||
| // Multi-AZ tests already simulate this in other tests instead of sending server failover requests. | ||
| @EnableOnDatabaseEngineDeployment(DatabaseEngineDeployment.AURORA) |
Contributor
Author
There was a problem hiding this comment.
This test passes on multi-AZ now
| if (conn == null) { | ||
| // We cannot fetch the latest topology since we do not have access to a connection, so we return the original | ||
| // hosts parsed from the connection string. | ||
| if (!this.pluginService.isDialectConfirmed()) { |
Contributor
Author
There was a problem hiding this comment.
This is needed because without it, cluster topology monitors are created before the db dialect has been updated. This causes errors because the queries that the topology monitors execute are not aligned with the actual database dialect
sergiyvamz
reviewed
Dec 11, 2025
wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
...er/src/main/java/software/amazon/jdbc/hostlistprovider/ConnectionStringHostListProvider.java
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/DynamicHostListProvider.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
...r/src/main/java/software/amazon/jdbc/hostlistprovider/monitoring/ClusterTopologyMonitor.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
...er/src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareWriterFailoverHandler.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 11, 2025
wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
Outdated
Show resolved
Hide resolved
sergiyvamz
reviewed
Dec 12, 2025
| } | ||
|
|
||
| protected ClusterTopologyMonitor getOrCreateMonitor() throws SQLException { | ||
| ClusterTopologyMonitor monitor = this.servicesContainer.getMonitorService() |
sergiyvamz
reviewed
Dec 12, 2025
| return this.topologyUtils.queryForTopology(conn, initialHostSpec, this.instanceTemplate); | ||
| } | ||
|
|
||
| protected List<HostSpec> getFreshTopology(boolean shouldVerifyWriter, long timeoutMs) throws SQLException { |
Contributor
There was a problem hiding this comment.
boolean shouldVerifyWriter, long timeoutMs - not in use
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes the old non-monitoring RdsHostListProvider so that the default HostListProvider is a monitoring one.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.