diff options
| author | antirez <antirez@gmail.com> | 2014-05-15 17:03:28 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2014-05-15 17:03:28 +0200 |
| commit | 67133d2f4882da652fd3e78ba15220bce2488d05 (patch) | |
| tree | 6bb968cfdcffb85d07af4cd8f227fc60948932d3 | |
| parent | 8c6e92c3bc59052f16d8ba6f24040b66d28c03b2 (diff) | |
| download | redis-67133d2f4882da652fd3e78ba15220bce2488d05.tar.gz | |
Cluster: use clusterSetNodeAsMaster() during slave failover.
clusterHandleSlaveFailover() was reimplementing what
clusterSetNodeAsMaster() without any good reason.
| -rw-r--r-- | src/cluster.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cluster.c b/src/cluster.c index 3199f0de7..59193680c 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -2504,10 +2504,7 @@ void clusterHandleSlaveFailover(void) { * this slave to a master. * * 1) Turn this node into a master. */ - clusterNodeRemoveSlave(myself->slaveof, myself); - myself->flags &= ~REDIS_NODE_SLAVE; - myself->flags |= REDIS_NODE_MASTER; - myself->slaveof = NULL; + clusterSetNodeAsMaster(myself); replicationUnsetMaster(); /* 2) Claim all the slots assigned to our master. */ |