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
c72449af
Commit
c72449af
authored
Feb 05, 2014
by
antirez
Browse files
Cluster: check that a MF is in progress in manualFailoverCheckTimeout().
Otherwise it is always detected as a manual failover timed out.
parent
b7402bca
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
c72449af
...
@@ -2299,7 +2299,7 @@ void resetManualFailover(void) {
...
@@ -2299,7 +2299,7 @@ void resetManualFailover(void) {
/* If a manual failover timed out, abort it. */
/* If a manual failover timed out, abort it. */
void
manualFailoverCheckTimeout
(
void
)
{
void
manualFailoverCheckTimeout
(
void
)
{
if
(
server
.
cluster
->
mf_end
<
mstime
())
{
if
(
server
.
cluster
->
mf_end
&&
server
.
cluster
->
mf_end
<
mstime
())
{
redisLog
(
REDIS_WARNING
,
"Manual failover timed out."
);
redisLog
(
REDIS_WARNING
,
"Manual failover timed out."
);
resetManualFailover
();
resetManualFailover
();
}
}
...
...
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