fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-18 21:21:20 +00:00
Code Issues Projects Releases Wiki Activity

replicationHandleMasterDisconnection() belongs to replication.c.

Browse Source
This commit is contained in:
antirez 2015-07-28 14:36:50 +02:00
parent 0b76524983
commit 5a9bc7cc10
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/networking.c
View File

@ -667,20 +667,6 @@ void disconnectSlaves(void) {
} }
} }
/* This function is called when the slave lose the connection with the
* master into an unexpected way. */
void replicationHandleMasterDisconnection(void) {
server.master = NULL;
server.repl_state = REDIS_REPL_CONNECT;
server.repl_down_since = server.unixtime;
/* We lost connection with our master, force our slaves to resync
* with us as well to load the new data set.
*
* If server.masterhost is NULL the user called SLAVEOF NO ONE so
* slave resync is not needed. */
if (server.masterhost != NULL) disconnectSlaves();
}
void freeClient(redisClient *c) { void freeClient(redisClient *c) {
listNode *ln; listNode *ln;

14
src/replication.c
View File

@ -1657,6 +1657,20 @@ void replicationUnsetMaster(void) {
server.repl_state = REDIS_REPL_NONE; server.repl_state = REDIS_REPL_NONE;
} }
/* This function is called when the slave lose the connection with the
* master into an unexpected way. */
void replicationHandleMasterDisconnection(void) {
server.master = NULL;
server.repl_state = REDIS_REPL_CONNECT;
server.repl_down_since = server.unixtime;
/* We lost connection with our master, force our slaves to resync
* with us as well to load the new data set.
*
* If server.masterhost is NULL the user called SLAVEOF NO ONE so
* slave resync is not needed. */
if (server.masterhost != NULL) disconnectSlaves();
}
void slaveofCommand(redisClient *c) { void slaveofCommand(redisClient *c) {
/* SLAVEOF is not allowed in cluster mode as replication is automatically /* SLAVEOF is not allowed in cluster mode as replication is automatically
* configured using the current address of the master node. */ * configured using the current address of the master node. */