Redis Cluster: check nodes hosts and ports at the moment of connection creation

Author: Veirisa

driver/src/main/java/jdbc/client/impl/RedisJedisURIBase.java

@@ -44,7 +44,7 @@ public abstract class RedisJedisURIBase implements JedisClientConfig {
     private SSLSocketFactory sslSocketFactory;
 
     // host and port mapper
-    private HostAndPortMapper hostAndPortMapper;
+    private CompleteHostAndPortMapper hostAndPortMapper;
 
 
     protected RedisJedisURIBase(String url, Properties info) throws SQLException {
@@ -203,7 +203,7 @@ protected boolean getBoolean(Map<String, String> parameters, Properties info, St
 
     private void setHostAndPortMapping(Properties info) {
         Map<HostAndPort, HostAndPort> mapping = getMap(info, HOST_AND_PORT_MAPPING, this::parseHostAndPort, this::parseHostAndPort);
-        this.hostAndPortMapper = mapping == null ? null : new ClientHostAndPortMapper(mapping);
+        this.hostAndPortMapper = mapping == null ? null : new CompleteHostAndPortMapper(mapping);
     }
 
     // TODO (cluster): improvements + tests
@@ -262,15 +262,15 @@ public SSLSocketFactory getSslSocketFactory() {
     }
 
     @Override
-    public HostAndPortMapper getHostAndPortMapper() {
+    public CompleteHostAndPortMapper getHostAndPortMapper() {
         return hostAndPortMapper;
     }
 
 
-    protected static class ClientHostAndPortMapper implements HostAndPortMapper {
+    public static class CompleteHostAndPortMapper implements HostAndPortMapper {
         private final Map<HostAndPort, HostAndPort> mapping;
 
-        public ClientHostAndPortMapper(@NotNull Map<HostAndPort, HostAndPort> mapping) {
+        public CompleteHostAndPortMapper(@NotNull Map<HostAndPort, HostAndPort> mapping) {
             this.mapping = mapping;
         }
 

driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterClient.java

@@ -2,13 +2,16 @@
 
 import jdbc.client.RedisMode;
 import jdbc.client.impl.RedisClientBase;
+import jdbc.client.impl.RedisJedisURIBase.CompleteHostAndPortMapper;
 import jdbc.client.impl.standalone.RedisJedisClient;
 import jdbc.client.structures.query.NodeHint;
 import jdbc.client.structures.query.RedisKeysPatternQuery;
 import jdbc.client.structures.query.RedisQuery;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import redis.clients.jedis.*;
 import redis.clients.jedis.Protocol.Command;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.jedis.util.JedisClusterHashTag;
@@ -29,11 +32,22 @@ public class RedisJedisClusterClient extends RedisClientBase {
     public RedisJedisClusterClient(@NotNull RedisJedisClusterURI uri) throws SQLException {
         try {
             jedisCluster = new JedisCluster(uri.getNodes(), uri, uri.getMaxAttempts(), new SingleConnectionPoolConfig());
+            checkClusterNodes(jedisCluster, uri.getHostAndPortMapper());
         } catch (JedisException e) {
             throw sqlWrap(e);
         }
     }
 
+    private static void checkClusterNodes(@NotNull JedisCluster cluster,
+                                          @Nullable CompleteHostAndPortMapper hostAndPortMapper) throws JedisConnectionException {
+        if (hostAndPortMapper == null) return;
+        Iterable<String> nodeKeys = cluster.getClusterNodes().keySet();
+        for (String nodeKey : nodeKeys) {
+            HostAndPort nodeHostAndPort = HostAndPort.from(nodeKey);
+            hostAndPortMapper.getHostAndPort(nodeHostAndPort);
+        }
+    }
+
 
     @Override
     public Object execute(@NotNull RedisQuery query) throws SQLException {