Skip to content

Commit

Permalink
Cluster: removed an old source of delay to start the slave failover.
Browse files Browse the repository at this point in the history
  • Loading branch information
antirez committed Sep 26, 2013
1 parent a445aa3 commit 42fa46e
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/cluster.c
Original file line number Diff line number Diff line change
Expand Up @@ -1624,7 +1624,7 @@ void clusterHandleSlaveFailover(void) {
if (mstime() < server.cluster->failover_auth_time) return;

/* Return ASAP if the election is too old to be valid. */
if (mstime() - server.cluster->failover_auth_time > server.cluster_node_timeout)
if (mstime() - server.cluster->failover_auth_time > server.cluster_node_timeout * 1000)
return;

/* Ask for votes if needed. */
Expand Down Expand Up @@ -1835,16 +1835,10 @@ void clusterCron(void) {
}

/* If we are a slave and our master is down, but is serving slots,
* call the function that handles the failover.
* This function is called with a small delay in order to let the
* FAIL message to propagate after failure detection, this is not
* strictly required but makes 99.99% of failovers mechanically
* simpler. */
* call the function that handles the failover. */
if (server.cluster->myself->flags & REDIS_NODE_SLAVE &&
server.cluster->myself->slaveof &&
server.cluster->myself->slaveof->flags & REDIS_NODE_FAIL &&
(server.unixtime - server.cluster->myself->slaveof->fail_time) >
REDIS_CLUSTER_FAILOVER_DELAY &&
server.cluster->myself->slaveof->numslots != 0)
{
clusterHandleSlaveFailover();
Expand Down

0 comments on commit 42fa46e

Please sign in to comment.