diff --git a/src/main/java/org/redisson/BaseConfig.java b/src/main/java/org/redisson/BaseConfig.java index a048ff8e5..8898d1db4 100644 --- a/src/main/java/org/redisson/BaseConfig.java +++ b/src/main/java/org/redisson/BaseConfig.java @@ -42,9 +42,7 @@ class BaseConfig> { private int connectTimeout = 1000; /** - * Redis operation execution timeout. - * Then amount is reached exception will be thrown in case of sync operation usage - * or Future callback fails in case of async operation. + * Redis server response timeout. Starts to countdown when Redis command was succesfully sent. * Value in milliseconds. * */ @@ -68,7 +66,7 @@ class BaseConfig> { /** * Redis server will be excluded from the list of available slave nodes * when sequential unsuccessful execution attempts of any Redis command - * reaches slaveFailedAttempts. + * reaches failedAttempts. */ private int failedAttempts = 3; @@ -143,12 +141,10 @@ class BaseConfig> { } /** - * Reconnection attempts amount. - * Then amount is reached exception will be thrown in case of sync operation usage - * or Future callback fails in case of async operation. - * - * Used then connection with redis server is down. + * Error will be thrown if Redis command can't be sended to Redis server after retryAttempts. + * But if it sent succesfully then timeout will be started. * + * @see #timeout * @param retryAttempts */ public T setRetryAttempts(int retryAttempts) { @@ -160,10 +156,9 @@ class BaseConfig> { } /** - * Time pause before next command attempt. - * - * Used then connection with redis server is down. + * Time interval after which another one attempt to send Redis command will be executed. * + * @see retryAttempts * @param retryInterval - time in milliseconds */ public T setRetryInterval(int retryInterval) { @@ -189,9 +184,7 @@ class BaseConfig> { } /** - * Redis operation execution timeout. - * Then amount is reached exception will be thrown in case of sync operation usage - * or Future callback fails in case of async operation. + * Redis server response timeout. * * @param timeout in milliseconds */ diff --git a/src/main/java/org/redisson/ClusterServersConfig.java b/src/main/java/org/redisson/ClusterServersConfig.java index 4f9d4ff0f..7eb577a67 100644 --- a/src/main/java/org/redisson/ClusterServersConfig.java +++ b/src/main/java/org/redisson/ClusterServersConfig.java @@ -34,7 +34,7 @@ public class ClusterServersConfig extends BaseMasterSlaveServersConfig