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
76a3954f
Commit
76a3954f
authored
Mar 15, 2013
by
antirez
Browse files
Cluster: fix clusterHandleSlaveFailover() conditional: quorum is enough.
parent
90e99a20
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
76a3954f
...
@@ -1355,16 +1355,16 @@ void clusterHandleSlaveFailover(void) {
...
@@ -1355,16 +1355,16 @@ void clusterHandleSlaveFailover(void) {
/* Ask masters if we are authorized to perform the failover. If there
/* Ask masters if we are authorized to perform the failover. If there
* is a pending auth request that's too old, reset it. */
* is a pending auth request that's too old, reset it. */
if
(
server
.
cluster
->
failover_auth_time
==
0
||
auth_age
>
15
)
{
if
(
server
.
cluster
->
failover_auth_time
==
0
||
auth_age
>
15
)
{
server
.
cluster
->
failover_auth_time
=
time
(
NULL
);
server
.
cluster
->
failover_auth_time
=
time
(
NULL
);
server
.
cluster
->
failover_auth_count
=
0
;
server
.
cluster
->
failover_auth_count
=
0
;
clusterRequestFailoverAuth
();
clusterRequestFailoverAuth
();
return
;
/* Wait for replies. */
return
;
/* Wait for replies. */
}
}
/* Check if we reached the quorum. */
/* Check if we reached the quorum. */
if
(
server
.
cluster
->
failover_auth_count
>
needed_quorum
)
{
if
(
server
.
cluster
->
failover_auth_count
>
=
needed_quorum
)
{
redisLog
(
REDIS_WARNING
,
redisLog
(
REDIS_WARNING
,
"Masters quorum reached: failing over my (failing) master."
);
"Masters quorum reached: failing over my (failing) master."
);
/* TODO: Perform election. */
/* TODO: Perform election. */
...
...
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