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
17718fdc
Commit
17718fdc
authored
Nov 13, 2013
by
antirez
Browse files
Sentinel: make sure role_reported is always updated.
parent
46a053d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
17718fdc
...
...
@@ -1546,20 +1546,21 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
/* When what we believe is our master, turned into a slave, the wiser
* thing we can do is to follow the events and redirect to the new
* master, always. */
if
((
ri
->
flags
&
SRI_MASTER
)
&&
role
==
SRI_SLAVE
&&
ri
->
slave_master_host
)
{
if
((
ri
->
flags
&
SRI_MASTER
)
&&
role
==
SRI_SLAVE
)
{
if
(
ri
->
role_reported
!=
SRI_MASTER
)
{
ri
->
role_reported_time
=
mstime
();
ri
->
role_reported
=
SRI_MASTER
;
}
sentinelEvent
(
REDIS_WARNING
,
"+redirect-to-master"
,
ri
,
"%s %s %d %s %d"
,
ri
->
name
,
ri
->
addr
->
ip
,
ri
->
addr
->
port
,
ri
->
slave_master_host
,
ri
->
slave_master_port
);
sentinelResetMasterAndChangeAddress
(
ri
,
ri
->
slave_master_host
,
ri
->
slave_master_port
);
return
;
/* Don't process anything after this event. */
if
(
ri
->
slave_master_host
)
{
sentinelEvent
(
REDIS_WARNING
,
"+redirect-to-master"
,
ri
,
"%s %s %d %s %d"
,
ri
->
name
,
ri
->
addr
->
ip
,
ri
->
addr
->
port
,
ri
->
slave_master_host
,
ri
->
slave_master_port
);
sentinelResetMasterAndChangeAddress
(
ri
,
ri
->
slave_master_host
,
ri
->
slave_master_port
);
return
;
/* Don't process anything after this event. */
}
}
/* Handle slave -> master role switch. */
...
...
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