aws-advanced-jdbc-wrapper.git / summary / log / commit / refs
commit b949bcdfd4f07caeddd08445a34157cac15b8553
Author: sergiyvamz <75754709+sergiyvamz@users.noreply.github.com>
Commit: GitHub <noreply@github.com>
Date: Mon Mar 09 16:54:49 2026 +0000
chore: refactor the fastest response time strategy plugin to use StorageService (#1760)
.../ClusterTopologyMonitorImpl.java | 4 ++-
.../HostResponseTimeServiceImpl.java | 31 +++++++++++-----
.../fastestresponse/NodeResponseTimeMonitor.java | 11 ++++--
.../fastestresponse/ResponseTimeHolder.java | 42 ++++++++++++++++++++++
.../jdbc/util/storage/ExternallyManagedCache.java | 1 +
.../amazon/jdbc/util/storage/StorageService.java | 11 ++++++
.../jdbc/util/storage/StorageServiceImpl.java | 11 ++++--
7 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ClusterTopologyMonitorImpl.java b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ClusterTopologyMonitorImpl.java
index 7e3d936f..f6c1f216 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ClusterTopologyMonitorImpl.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/ClusterTopologyMonitorImpl.java
@@ -226,12 +226,14 @@ public class ClusterTopologyMonitorImpl extends AbstractMonitor
}
private List<HostSpec> getStoredHosts() {
- Topology topology = this.servicesContainer.getStorageService().get(Topology.class, this.clusterId);
+ Topology topology =
+ this.servicesContainer.getStorageService().get(Topology.class, this.clusterId, false);
return topology == null ? null : topology.getHosts();
}
@Override
public void stop() {
+ this.stop.set(true);
this.nodeThreadsStop.set(true);
this.closeNodeMonitors();
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/HostResponseTimeServiceImpl.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/HostResponseTimeServiceImpl.java
index 4b579543..279dcab4 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/HostResponseTimeServiceImpl.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/HostResponseTimeServiceImpl.java
@@ -18,9 +18,11 @@ package software.amazon.jdbc.plugin.strategy.fastestresponse;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.checkerframework.checker.nullness.qual.NonNull;
@@ -28,11 +30,13 @@ import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.PluginService;
import software.amazon.jdbc.util.FullServicesContainer;
import software.amazon.jdbc.util.Messages;
+import software.amazon.jdbc.util.monitoring.MonitorErrorResponse;
public class HostResponseTimeServiceImpl implements HostResponseTimeService {
private static final Logger LOGGER =
Logger.getLogger(HostResponseTimeServiceImpl.class.getName());
+ private static final long MONITOR_DISPOSAL_TIME_NANO = TimeUnit.MINUTES.toNanos(10);
protected int intervalMs;
protected List<HostSpec> hosts = new ArrayList<>();
@@ -50,17 +54,28 @@ public class HostResponseTimeServiceImpl implements HostResponseTimeService {
this.pluginService = servicesContainer.getPluginService();
this.props = props;
this.intervalMs = intervalMs;
+
+ this.servicesContainer.getStorageService().registerItemClassIfAbsent(
+ ResponseTimeHolder.class,
+ true,
+ MONITOR_DISPOSAL_TIME_NANO,
+ null,
+ null
+ );
+
+ this.servicesContainer.getMonitorService().registerMonitorTypeIfAbsent(
+ NodeResponseTimeMonitor.class,
+ MONITOR_DISPOSAL_TIME_NANO,
+ TimeUnit.MINUTES.toNanos(3),
+ EnumSet.of(MonitorErrorResponse.RECREATE),
+ ResponseTimeHolder.class);
}
@Override
public int getResponseTime(HostSpec hostSpec) {
- final NodeResponseTimeMonitor monitor =
- this.servicesContainer.getMonitorService().get(NodeResponseTimeMonitor.class, hostSpec.getUrl());
- if (monitor == null) {
- return Integer.MAX_VALUE;
- }
-
- return monitor.getResponseTime();
+ final ResponseTimeHolder responseTimeHolder =
+ this.servicesContainer.getStorageService().get(ResponseTimeHolder.class, hostSpec.getUrl());
+ return responseTimeHolder == null ? Integer.MAX_VALUE : responseTimeHolder.getResponseTime();
}
@Override
@@ -80,7 +95,7 @@ public class HostResponseTimeServiceImpl implements HostResponseTimeService {
servicesContainer,
this.props,
(servicesContainer) -> new NodeResponseTimeMonitor(
- servicesContainer.getPluginService(), hostSpec, this.props, this.intervalMs));
+ servicesContainer, hostSpec, this.props, this.intervalMs));
} catch (SQLException e) {
LOGGER.warning(
Messages.get("HostResponseTimeServiceImpl.errorStartingMonitor", new Object[] {hostSpec.getUrl(), e}));
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/NodeResponseTimeMonitor.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/NodeResponseTimeMonitor.java
index a3edf308..9cbf74d0 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/NodeResponseTimeMonitor.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/NodeResponseTimeMonitor.java
@@ -35,6 +35,7 @@ import software.amazon.jdbc.AtomicConnection;
import software.amazon.jdbc.HostSpec;
import software.amazon.jdbc.PluginService;
import software.amazon.jdbc.PropertyDefinition;
+import software.amazon.jdbc.util.FullServicesContainer;
import software.amazon.jdbc.util.Messages;
import software.amazon.jdbc.util.Pair;
import software.amazon.jdbc.util.PropertyUtils;
@@ -68,6 +69,7 @@ public class NodeResponseTimeMonitor extends AbstractMonitor implements EventSub
private final @NonNull Properties props;
private final @NonNull Properties monitoringConnProperties;
private final @NonNull PluginService pluginService;
+ private final @NonNull FullServicesContainer servicesContainer;
private final TelemetryFactory telemetryFactory;
private final TelemetryGauge responseTimeMsGauge;
@@ -75,13 +77,14 @@ public class NodeResponseTimeMonitor extends AbstractMonitor implements EventSub
private AtomicConnection monitoringConn;
public NodeResponseTimeMonitor(
- final @NonNull PluginService pluginService,
+ final @NonNull FullServicesContainer servicesContainer,
final @NonNull HostSpec hostSpec,
final @NonNull Properties props,
int intervalMs) {
super(TERMINATION_TIMEOUT_SEC);
- this.pluginService = pluginService;
+ this.servicesContainer = servicesContainer;
+ this.pluginService = servicesContainer.getPluginService();
this.hostSpec = hostSpec;
this.props = props;
this.intervalMs = intervalMs;
@@ -159,8 +162,11 @@ public class NodeResponseTimeMonitor extends AbstractMonitor implements EventSub
if (count > 0) {
this.responseTime.set((int) TimeUnit.NANOSECONDS.toMillis(responseTimeSum / count));
+ this.servicesContainer.getStorageService().set(this.hostSpec.getUrl(),
+ new ResponseTimeHolder(this.hostSpec.getUrl(), this.responseTime.get()));
} else {
this.responseTime.set(Integer.MAX_VALUE);
+ this.servicesContainer.getStorageService().remove(ResponseTimeHolder.class, this.hostSpec.getUrl());
}
this.checkTimestamp.set(this.getCurrentTime());
@@ -224,6 +230,7 @@ public class NodeResponseTimeMonitor extends AbstractMonitor implements EventSub
LOGGER.finest("Reset: " + this.hostSpec.getHost());
this.monitoringConn.set(null);
this.responseTime.set(Integer.MAX_VALUE);
+ this.servicesContainer.getStorageService().remove(ResponseTimeHolder.class, this.hostSpec.getUrl());
this.checkTimestamp.set(this.getCurrentTime());
}
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/ResponseTimeHolder.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/ResponseTimeHolder.java
new file mode 100644
index 00000000..9d9fbd9b
--- /dev/null
+++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/strategy/fastestresponse/ResponseTimeHolder.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package software.amazon.jdbc.plugin.strategy.fastestresponse;
+
+public class ResponseTimeHolder {
+ private final String url;
+ private final int responseTime;
+
+ public ResponseTimeHolder(String url, int responseTime) {
+ this.url = url;
+ this.responseTime = responseTime;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public int getResponseTime() {
+ return responseTime;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("ResponseTimeHolder@%s [url=%s, responseTime=%d]",
+ Integer.toHexString(System.identityHashCode(this)),
+ this.url, this.responseTime);
+ }
+}
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/storage/ExternallyManagedCache.java b/wrapper/src/main/java/software/amazon/jdbc/util/storage/ExternallyManagedCache.java
index fb2fbe53..34e892be 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/storage/ExternallyManagedCache.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/storage/ExternallyManagedCache.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.logging.Logger;
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageService.java b/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageService.java
index b554229d..d5372f24 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageService.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageService.java
@@ -52,6 +52,17 @@ public interface StorageService extends StateSnapshotProvider {
*/
<V> void set(Object key, V item);
+ /**
+ * Gets an item stored in the storage service.
+ *
+ * @param itemClass the expected class of the item being retrieved, eg `CustomEndpointInfo.class`.
+ * @param key the key for the item, eg "custom-endpoint.cluster-custom-XYZ.us-east-2.rds.amazonaws.com:5432".
+ * @param registerDataAccess true if accessing cached data requires registering data access.
+ * @param <V> the type of the item being retrieved.
+ * @return the item stored at the given key for the given item class.
+ */
+ <V> @Nullable V get(Class<V> itemClass, @NonNull Object key, boolean registerDataAccess);
+
/**
* Gets an item stored in the storage service.
*
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageServiceImpl.java b/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageServiceImpl.java
index 758e3a22..fae8753c 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageServiceImpl.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/storage/StorageServiceImpl.java
@@ -120,6 +120,11 @@ public class StorageServiceImpl implements StorageService {
@Override
public <V> @Nullable V get(Class<V> itemClass, @NonNull Object key) {
+ return this.get(itemClass, key, true);
+ }
+
+ @Override
+ public <V> @Nullable V get(Class<V> itemClass, @NonNull Object key, boolean registerDataAccess) {
final ExpirationCache<Object, ?> cache = caches.get(itemClass);
if (cache == null) {
return null;
@@ -131,8 +136,10 @@ public class StorageServiceImpl implements StorageService {
}
if (itemClass.isInstance(value)) {
- DataAccessEvent event = new DataAccessEvent(itemClass, key);
- this.publisher.publish(event);
+ if (registerDataAccess) {
+ DataAccessEvent event = new DataAccessEvent(itemClass, key);
+ this.publisher.publish(event);
+ }
return itemClass.cast(value);
}
[parent: 8ff647b26159]