Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Move maxTime calculation for topology refresh to and delegate shouldUseCachedValue() to newly introduced overload.

Original Pull Request: #2989
This commit is contained in:
Christoph Strobl
2024-09-11 11:59:30 +02:00
parent 1514461561
commit fd31e433c0
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterConnection.java
View File

@@ -854,9 +854,8 @@ public class JedisClusterConnection implements RedisClusterConnection {
try (Connection connection = entry.getValue().getResource()) {
Set<RedisClusterNode> nodes = Converters.toSetOfRedisClusterNodes(new Jedis(connection).clusterNodes());
topology = cached = new JedisClusterTopology(nodes, System.currentTimeMillis());
topology = cached = new JedisClusterTopology(nodes, System.currentTimeMillis(), cacheTimeMs);
return topology;
} catch (Exception ex) {
@@ -884,9 +883,9 @@ public class JedisClusterConnection implements RedisClusterConnection {
* @since 2.2
* @deprecated since 3.3.4, use {@link #shouldUseCachedValue(JedisClusterTopology)} instead.
*/
@Deprecated(since = "3.3.4")
@Deprecated(since = "3.3.4", forRemoval = true)
protected boolean shouldUseCachedValue() {
return false;
return shouldUseCachedValue(cached);
}
/**
@@ -899,22 +898,38 @@ public class JedisClusterConnection implements RedisClusterConnection {
* @since 3.3.4
*/
protected boolean shouldUseCachedValue(@Nullable JedisClusterTopology topology) {
return topology != null && topology.getTime() + cacheTimeMs > System.currentTimeMillis();
return topology != null && topology.getMaxTime() > System.currentTimeMillis();
}
}
protected static class JedisClusterTopology extends ClusterTopology {
private final long time;
private final long timeoutMs;
public JedisClusterTopology(Set<RedisClusterNode> nodes, long time) {
JedisClusterTopology(Set<RedisClusterNode> nodes, long creationTimeMs, long timeoutMs) {
super(nodes);
this.time = time;
this.time = creationTimeMs;
this.timeoutMs = timeoutMs;
}
/**
* Get the time in ms when the {@link ClusterTopology} was captured.
*
* @return ClusterTopology time.
*/
public long getTime() {
return time;
}
/**
* Get the maximum time in ms the {@link ClusterTopology} should be used before a refresh is required.
*
* @return ClusterTopology maximum age.
*/
long getMaxTime() {
return time + timeoutMs;
}
}
protected JedisCluster getCluster() {