From 7cec9e48cea8caf3d03685f017ca51510ead7f7c Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 18 Feb 2014 10:27:38 +0100 Subject: [PATCH] Sentinel: SENTINEL_SLAVE_RECONF_RETRY_PERIOD -> RECONF_TIMEOUT Rename define to match the new meaning. --- src/sentinel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sentinel.c b/src/sentinel.c index 7713cce7..9fbd43de 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -78,7 +78,7 @@ typedef struct sentinelAddr { #define SENTINEL_TILT_TRIGGER 2000 #define SENTINEL_TILT_PERIOD (SENTINEL_PING_PERIOD*30) #define SENTINEL_DEFAULT_SLAVE_PRIORITY 100 -#define SENTINEL_SLAVE_RECONF_RETRY_PERIOD 10000 +#define SENTINEL_SLAVE_RECONF_TIMEOUT 10000 #define SENTINEL_DEFAULT_PARALLEL_SYNCS 1 #define SENTINEL_MIN_LINK_RECONNECT_PERIOD 15000 #define SENTINEL_DEFAULT_FAILOVER_TIMEOUT (60*3*1000) @@ -3370,7 +3370,7 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) { * configuration later. */ if ((slave->flags & SRI_RECONF_SENT) && (mstime() - slave->slave_reconf_sent_time) > - SENTINEL_SLAVE_RECONF_RETRY_PERIOD) + SENTINEL_SLAVE_RECONF_TIMEOUT) { sentinelEvent(REDIS_NOTICE,"-slave-reconf-sent-timeout",slave,"%@"); slave->flags &= ~SRI_RECONF_SENT;