From d22f862fcbee61cd9625245c39c926016a3a9499 Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 23 Nov 2015 15:06:49 +0300 Subject: [PATCH] new params renamed --- src/main/java/org/redisson/BaseConfig.java | 54 +++++++++++++++++++ .../BaseMasterSlaveServersConfig.java | 51 ------------------ .../cluster/ClusterConnectionManager.java | 4 +- .../ElasticacheConnectionManager.java | 4 +- .../MasterSlaveConnectionManager.java | 2 +- .../connection/SentinelConnectionManager.java | 4 +- .../org/redisson/misc/ConnectionPool.java | 10 ++-- 7 files changed, 66 insertions(+), 63 deletions(-) diff --git a/src/main/java/org/redisson/BaseConfig.java b/src/main/java/org/redisson/BaseConfig.java index 3c59d5157..a048ff8e5 100644 --- a/src/main/java/org/redisson/BaseConfig.java +++ b/src/main/java/org/redisson/BaseConfig.java @@ -54,6 +54,24 @@ class BaseConfig> { private int retryInterval = 1000; + /** + * Redis server reconnection attempt timeout. + * + * On every such timeout event Redisson tries + * to connect to disconnected Redis server. + * + * @see #failedAttempts + * + */ + private int reconnectionTimeout = 3000; + + /** + * Redis server will be excluded from the list of available slave nodes + * when sequential unsuccessful execution attempts of any Redis command + * reaches slaveFailedAttempts. + */ + private int failedAttempts = 3; + @Deprecated private int closeConnectionAfterFailAttempts = -1; @@ -92,6 +110,8 @@ class BaseConfig> { setRefreshConnectionAfterFails(config.getRefreshConnectionAfterFails()); setConnectTimeout(config.getConnectTimeout()); setIdleConnectionTimeout(config.getIdleConnectionTimeout()); + setFailedAttempts(config.getFailedAttempts()); + setReconnectionTimeout(config.getReconnectionTimeout()); } /** @@ -257,5 +277,39 @@ class BaseConfig> { return idleConnectionTimeout; } + /** + * Redis server reconnection attempt timeout. + * + * On every such timeout event Redisson tries + * to connect to disconnected Redis server. + * + * Default is 3000 + * + * @see #failedAttempts + * + */ + + public T setReconnectionTimeout(int slaveRetryTimeout) { + this.reconnectionTimeout = slaveRetryTimeout; + return (T)this; + } + public int getReconnectionTimeout() { + return reconnectionTimeout; + } + + /** + * Redis 'slave' server will be excluded from the list of available slave nodes + * when sequential unsuccessful execution attempts of any Redis command on slave node reaches slaveFailedAttempts. + * + * Default is 3 + * + */ + public T setFailedAttempts(int slaveFailedAttempts) { + this.failedAttempts = slaveFailedAttempts; + return (T)this; + } + public int getFailedAttempts() { + return failedAttempts; + } } diff --git a/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java b/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java index 94e5b3fcc..1b08cee24 100644 --- a/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java +++ b/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java @@ -55,22 +55,6 @@ public class BaseMasterSlaveServersConfigslaveFailedAttempts - */ - private int slaveFailedAttempts = 3; - public BaseMasterSlaveServersConfig() { } @@ -80,8 +64,6 @@ public class BaseMasterSlaveServersConfigslaveFailedAttempts. - * - * Default is 3 - * - */ - public T setSlaveFailedAttempts(int slaveFailedAttempts) { - this.slaveFailedAttempts = slaveFailedAttempts; - return (T)this; - } - public int getSlaveFailedAttempts() { - return slaveFailedAttempts; - } - /** * Redis 'slave' node minimum idle connection amount for each slave node * diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java index 5434ebeac..0db04584c 100644 --- a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java +++ b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java @@ -397,8 +397,8 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager { c.setConnectTimeout(cfg.getConnectTimeout()); c.setIdleConnectionTimeout(cfg.getIdleConnectionTimeout()); - c.setSlaveFailedAttempts(cfg.getSlaveFailedAttempts()); - c.setSlaveReconnectionTimeout(cfg.getSlaveReconnectionTimeout()); + c.setFailedAttempts(cfg.getFailedAttempts()); + c.setReconnectionTimeout(cfg.getReconnectionTimeout()); c.setMasterConnectionMinimumIdleSize(cfg.getMasterConnectionMinimumIdleSize()); c.setSlaveConnectionMinimumIdleSize(cfg.getSlaveConnectionMinimumIdleSize()); c.setSlaveSubscriptionConnectionMinimumIdleSize(cfg.getSlaveSubscriptionConnectionMinimumIdleSize()); diff --git a/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java b/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java index d400e9cb2..e54c344ac 100644 --- a/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java +++ b/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java @@ -162,8 +162,8 @@ public class ElasticacheConnectionManager extends MasterSlaveConnectionManager { c.setConnectTimeout(cfg.getConnectTimeout()); c.setIdleConnectionTimeout(cfg.getIdleConnectionTimeout()); - c.setSlaveFailedAttempts(cfg.getSlaveFailedAttempts()); - c.setSlaveReconnectionTimeout(cfg.getSlaveReconnectionTimeout()); + c.setFailedAttempts(cfg.getFailedAttempts()); + c.setReconnectionTimeout(cfg.getReconnectionTimeout()); c.setMasterConnectionMinimumIdleSize(cfg.getMasterConnectionMinimumIdleSize()); c.setSlaveConnectionMinimumIdleSize(cfg.getSlaveConnectionMinimumIdleSize()); c.setSlaveSubscriptionConnectionMinimumIdleSize(cfg.getSlaveSubscriptionConnectionMinimumIdleSize()); diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index a29066bde..552e6abc1 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -151,7 +151,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { protected void init(MasterSlaveServersConfig config) { this.config = config; - int[] timeouts = new int[] {config.getRetryInterval(), config.getTimeout(), config.getSlaveReconnectionTimeout()}; + int[] timeouts = new int[] {config.getRetryInterval(), config.getTimeout(), config.getReconnectionTimeout()}; Arrays.sort(timeouts); int minTimeout = timeouts[0]; if (minTimeout % 100 != 0) { diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/src/main/java/org/redisson/connection/SentinelConnectionManager.java index d45a3b0a3..7e617f0c3 100755 --- a/src/main/java/org/redisson/connection/SentinelConnectionManager.java +++ b/src/main/java/org/redisson/connection/SentinelConnectionManager.java @@ -70,8 +70,8 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager { c.setConnectTimeout(cfg.getConnectTimeout()); c.setIdleConnectionTimeout(cfg.getIdleConnectionTimeout()); - c.setSlaveFailedAttempts(cfg.getSlaveFailedAttempts()); - c.setSlaveReconnectionTimeout(cfg.getSlaveReconnectionTimeout()); + c.setFailedAttempts(cfg.getFailedAttempts()); + c.setReconnectionTimeout(cfg.getReconnectionTimeout()); c.setMasterConnectionMinimumIdleSize(cfg.getMasterConnectionMinimumIdleSize()); c.setSlaveConnectionMinimumIdleSize(cfg.getSlaveConnectionMinimumIdleSize()); c.setSlaveSubscriptionConnectionMinimumIdleSize(cfg.getSlaveSubscriptionConnectionMinimumIdleSize()); diff --git a/src/main/java/org/redisson/misc/ConnectionPool.java b/src/main/java/org/redisson/misc/ConnectionPool.java index c01cef402..ae851565e 100644 --- a/src/main/java/org/redisson/misc/ConnectionPool.java +++ b/src/main/java/org/redisson/misc/ConnectionPool.java @@ -147,7 +147,7 @@ public class ConnectionPool { } protected boolean tryAcquireConnection(ClientConnectionsEntry entry) { - return entry.getFailedAttempts() < config.getSlaveFailedAttempts() && entry.tryAcquireConnection(); + return entry.getFailedAttempts() < config.getFailedAttempts() && entry.tryAcquireConnection(); } protected T poll(ClientConnectionsEntry entry) { @@ -201,7 +201,7 @@ public class ConnectionPool { } private void promiseFailure(ClientConnectionsEntry entry, Promise promise, Throwable cause) { - if (entry.incFailedAttempts() == config.getSlaveFailedAttempts()) { + if (entry.incFailedAttempts() == config.getFailedAttempts()) { if (entry.getNodeType() == NodeType.SLAVE) { connectionManager.slaveDown(masterSlaveEntry, entry.getClient().getAddr().getHostName(), entry.getClient().getAddr().getPort(), FreezeReason.RECONNECT); @@ -223,7 +223,7 @@ public class ConnectionPool { private void promiseFailure(ClientConnectionsEntry entry, Promise promise, T conn) { int attempts = entry.incFailedAttempts(); - if (attempts == config.getSlaveFailedAttempts()) { + if (attempts == config.getFailedAttempts()) { if (entry.getNodeType() == NodeType.SLAVE) { connectionManager.slaveDown(masterSlaveEntry, entry.getClient().getAddr().getHostName(), entry.getClient().getAddr().getPort(), FreezeReason.RECONNECT); @@ -231,7 +231,7 @@ public class ConnectionPool { } else { freezeMaster(entry); } - } else if (attempts < config.getSlaveFailedAttempts()) { + } else if (attempts < config.getFailedAttempts()) { releaseConnection(entry, conn); } @@ -312,7 +312,7 @@ public class ConnectionPool { } }); } - }, config.getSlaveReconnectionTimeout(), TimeUnit.MILLISECONDS); + }, config.getReconnectionTimeout(), TimeUnit.MILLISECONDS); } public void returnConnection(ClientConnectionsEntry entry, T connection) {