Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
6e4662e4
Commit
6e4662e4
authored
Feb 18, 2014
by
antirez
Browse files
Sentinel: SENTINEL_SLAVE_RECONF_RETRY_PERIOD -> RECONF_TIMEOUT
Rename define to match the new meaning.
parent
bd31fcf1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
6e4662e4
...
@@ -78,7 +78,7 @@ typedef struct sentinelAddr {
...
@@ -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) {
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment