fix: use instance endpoint during monitoring connection status updates #429
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
sergiyvamz
reviewed
May 4, 2023
wrapper/src/main/java/software/amazon/jdbc/plugin/efm/MonitorImpl.java
Outdated
Show resolved
Hide resolved
karenc-bq
force-pushed
the
fix/efm_monitoring_endpoint
branch
from
92e5ac2 to
9076e43
Compare
sergiyvamz
reviewed
May 4, 2023
| String instanceEndpoint = getInstanceEndpointPattern(host.getHost()); | ||
| String instanceEndpoint = rdsHelper.getInstanceEndpointPattern( | ||
| host.getHost(), | ||
| AuroraHostListProvider.CLUSTER_INSTANCE_HOST_PATTERN.getString(this.props)); |
Contributor
There was a problem hiding this comment.
What if user configuration doesn't include Aurora host list provider?
sergiyvamz
reviewed
May 4, 2023
| protected Set<String> aliases = ConcurrentHashMap.newKeySet(); | ||
| protected Set<String> allAliases = ConcurrentHashMap.newKeySet(); | ||
| protected long weight; // Greater or equal 0. Lesser the weight, the healthier node. | ||
| protected String ipAddress; |
Contributor
There was a problem hiding this comment.
Probably we don't need it.
sergiyvamz
reviewed
May 4, 2023
| try { | ||
| final HostSpec currentHostSpec = this.pluginService.getCurrentHostSpec(); | ||
| String monitoringEndpoint = null; | ||
| final RdsUrlType rdsUrlType = this.rdsHelper.identifyRdsType(monitoringEndpoint); |
Contributor
There was a problem hiding this comment.
Qodana is right. You're passing null identifyRdsType()
sergiyvamz
reviewed
May 4, 2023
| if (resultSet.next()) { | ||
| instanceName = resultSet.getString(1); | ||
| } | ||
| String instanceEndpoint = rdsHelper.getInstanceEndpointPattern( |
Contributor
There was a problem hiding this comment.
Can we use topology to search for an instance details?
Contributor
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Summary
If the initial connection is established using an cluster endpoint, use an instance endpoint when verifying connection in EFM plugin or fallback to the IP address.
Description
Integration Test Run: https://github.com/Bit-Quill/aws-advanced-jdbc-wrapper/actions/runs/4878286818
Before
After
Additional Reviewers
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.