Unable to redefine RedisClient command execution timeout #570

src/main/java/org/redisson/cluster/ClusterConnectionManager.java

@@ -146,7 +146,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
             return newSucceededFuture(connection);
         }
 
-        RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getConnectTimeout());
+        RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getConnectTimeout(), cfg.getRetryInterval() * cfg.getRetryAttempts());
         final Promise<RedisConnection> result = newPromise();
         Future<RedisConnection> future = client.connectAsync();
         future.addListener(new FutureListener<RedisConnection>() {

src/main/java/org/redisson/connection/ConnectionManager.java

@@ -92,7 +92,7 @@ public interface ConnectionManager {
 
     Future<RedisConnection> connectionWriteOp(NodeSource source, RedisCommand<?> command);
 
-    RedisClient createClient(String host, int port, int timeout);
+    RedisClient createClient(String host, int port, int timeout, int commandTimeout);
 
     RedisClient createClient(NodeType type, String host, int port);
 

src/main/java/org/redisson/connection/ElasticacheConnectionManager.java

@@ -107,7 +107,7 @@ public class ElasticacheConnectionManager extends MasterSlaveConnectionManager {
         if (connection != null) {
             return connection;
         }
-        RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getConnectTimeout());
+        RedisClient client = createClient(addr.getHost(), addr.getPort(), cfg.getConnectTimeout(), cfg.getRetryInterval() * cfg.getRetryAttempts());
         try {
             connection = client.connect();
             Promise<RedisConnection> future = newPromise();

src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java

@@ -284,7 +284,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
 
     @Override
     public RedisClient createClient(NodeType type, String host, int port) {
-        RedisClient client = createClient(host, port, config.getConnectTimeout());
+        RedisClient client = createClient(host, port, config.getConnectTimeout(), config.getRetryInterval() * config.getRetryAttempts());
         clients.add(new RedisClientEntry(client, this, type));
         return client;
     }
@@ -295,8 +295,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
     }
 
     @Override
-    public RedisClient createClient(String host, int port, int timeout) {
-        return new RedisClient(group, socketChannelClass, host, port, timeout);
+    public RedisClient createClient(String host, int port, int timeout, int commandTimeout) {
+        return new RedisClient(group, socketChannelClass, host, port, timeout, commandTimeout);
     }
 
     @Override

src/main/java/org/redisson/connection/SentinelConnectionManager.java

@@ -64,7 +64,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
         final MasterSlaveServersConfig c = create(cfg);
 
         for (URI addr : cfg.getSentinelAddresses()) {
-            RedisClient client = createClient(addr.getHost(), addr.getPort(), c.getConnectTimeout());
+            RedisClient client = createClient(addr.getHost(), addr.getPort(), c.getConnectTimeout(), c.getRetryInterval() * c.getRetryAttempts());
             try {
                 RedisConnection connection = client.connect();
                 if (!connection.isActive()) {
@@ -140,7 +140,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
     }
 
     private Future<RedisPubSubConnection> registerSentinel(final SentinelServersConfig cfg, final URI addr, final MasterSlaveServersConfig c) {
-        RedisClient client = createClient(addr.getHost(), addr.getPort(), c.getConnectTimeout());
+        RedisClient client = createClient(addr.getHost(), addr.getPort(), c.getConnectTimeout(), c.getRetryInterval() * c.getRetryAttempts());
         RedisClient oldClient = sentinels.putIfAbsent(addr.getHost() + ":" + addr.getPort(), client);
         if (oldClient != null) {
             return newSucceededFuture(null);