fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-22 10:30:49 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: connect to our master ASAP after startup if we are a slave node.

Browse Source
This commit is contained in:
antirez 2013-03-05 16:12:08 +01:00
parent bac57ad14b
commit 1025dd7786
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cluster.c
View File

@ -1362,6 +1362,18 @@ void clusterCron(void) {
} }
} }
dictReleaseIterator(di); dictReleaseIterator(di);
/* If we are a slave node but the replication is still turned off,
* enable it if we know the address of our master and it appears to
* be up. */
if (server.cluster->myself->flags & REDIS_NODE_SLAVE &&
server.masterhost == NULL &&
server.cluster->myself->slaveof &&
!(server.cluster->myself->slaveof->flags & REDIS_NODE_NOADDR))
{
replicationSetMaster(server.cluster->myself->slaveof->ip,
server.cluster->myself->slaveof->port);
}
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------