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
0e38c5f3
Unverified
Commit
0e38c5f3
authored
Jan 08, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 08, 2020
Browse files
Merge pull request #6743 from yz1509/unstable
Sentinel: avoid sentinel changes promoted_slave to be its own replica.
parents
7080a28e
18c26760
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
0e38c5f3
...
@@ -4308,7 +4308,7 @@ void sentinelFailoverDetectEnd(sentinelRedisInstance *master) {
...
@@ -4308,7 +4308,7 @@ void sentinelFailoverDetectEnd(sentinelRedisInstance *master) {
sentinelRedisInstance
*
slave
=
dictGetVal
(
de
);
sentinelRedisInstance
*
slave
=
dictGetVal
(
de
);
int
retval
;
int
retval
;
if
(
slave
->
flags
&
(
SRI_RECONF_DONE
|
SRI_RECONF_SENT
))
continue
;
if
(
slave
->
flags
&
(
SRI_
PROMOTED
|
SRI_
RECONF_DONE
|
SRI_RECONF_SENT
))
continue
;
if
(
slave
->
link
->
disconnected
)
continue
;
if
(
slave
->
link
->
disconnected
)
continue
;
retval
=
sentinelSendSlaveOf
(
slave
,
retval
=
sentinelSendSlaveOf
(
slave
,
...
...
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