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

Fix Jedis cluster connection lookup for IPv6 hosts.

Browse Source 
We previously used our own mechanism to Render Host and Port causing that IPv6 addresses were enclosed in brackets.

Now we've aligned with Jedis' keying by using HostAndPort that just concatenates the host and port part.

Closes #3015
This commit is contained in:
Mark Paluch
2024-10-10 15:32:26 +02:00
parent 252c1ba7b2
commit 8d4aee7396
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,8 @@ import redis.clients.jedis.ConnectionPool;
import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisCluster;
import redis.clients.jedis.JedisClusterInfoCache;
import redis.clients.jedis.Protocol;
import redis.clients.jedis.providers.ClusterConnectionProvider;
import java.time.Duration;
@@ -764,11 +766,16 @@ public class JedisClusterConnection implements RedisClusterConnection {
throw new DataAccessResourceFailureException("Node %s is unknown to cluster".formatted(node));
}
@Nullable
private ConnectionPool getResourcePoolForSpecificNode(RedisClusterNode node) {
Map<String, ConnectionPool> clusterNodes = cluster.getClusterNodes();
if (clusterNodes.containsKey(node.asString())) {
return clusterNodes.get(node.asString());
HostAndPort hap = new HostAndPort(node.getHost(),
node.getPort() == null ? Protocol.DEFAULT_PORT : node.getPort());
String key = JedisClusterInfoCache.getNodeKey(hap);
if (clusterNodes.containsKey(key)) {
return clusterNodes.get(key);
}
return null;