提交 c72449af 编写于 作者: A antirez

Cluster: check that a MF is in progress in manualFailoverCheckTimeout().

Otherwise it is always detected as a manual failover timed out.
上级 b7402bca
......@@ -2299,7 +2299,7 @@ void resetManualFailover(void) {
/* If a manual failover timed out, abort it. */
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.");
resetManualFailover();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册