fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-05 09:11:03 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: SENTINEL_SLAVE_RECONF_RETRY_PERIOD -> RECONF_TIMEOUT

Browse Source 
Rename define to match the new meaning.
This commit is contained in:
antirez 2014-02-18 10:27:38 +01:00
parent 18b8bad53c
commit 7cec9e48ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sentinel.c
View File

@ -78,7 +78,7 @@ typedef struct sentinelAddr {
#define SENTINEL_TILT_TRIGGER 2000 #define SENTINEL_TILT_TRIGGER 2000
#define SENTINEL_TILT_PERIOD (SENTINEL_PING_PERIOD*30) #define SENTINEL_TILT_PERIOD (SENTINEL_PING_PERIOD*30)
#define SENTINEL_DEFAULT_SLAVE_PRIORITY 100 #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_DEFAULT_PARALLEL_SYNCS 1
#define SENTINEL_MIN_LINK_RECONNECT_PERIOD 15000 #define SENTINEL_MIN_LINK_RECONNECT_PERIOD 15000
#define SENTINEL_DEFAULT_FAILOVER_TIMEOUT (60*3*1000) #define SENTINEL_DEFAULT_FAILOVER_TIMEOUT (60*3*1000)
@ -3370,7 +3370,7 @@ void sentinelFailoverReconfNextSlave(sentinelRedisInstance *master) {
* configuration later. */ * configuration later. */
if ((slave->flags & SRI_RECONF_SENT) && if ((slave->flags & SRI_RECONF_SENT) &&
(mstime() - slave->slave_reconf_sent_time) > (mstime() - slave->slave_reconf_sent_time) >
SENTINEL_SLAVE_RECONF_RETRY_PERIOD) SENTINEL_SLAVE_RECONF_TIMEOUT)
{ {
sentinelEvent(REDIS_NOTICE,"-slave-reconf-sent-timeout",slave,"%@"); sentinelEvent(REDIS_NOTICE,"-slave-reconf-sent-timeout",slave,"%@");
slave->flags &= ~SRI_RECONF_SENT; slave->flags &= ~SRI_RECONF_SENT;