Commit c72449af authored by antirez's avatar 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
...@@ -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();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment