fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-07-31 16:31:58 +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 12d2a89410
commit 730f7c5f5e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/networking.c
View File

@@ -624,20 +624,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

@@ -1701,6 +1701,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) {
if (!strcasecmp(c->argv[1]->ptr,"no") && if (!strcasecmp(c->argv[1]->ptr,"no") &&
!strcasecmp(c->argv[2]->ptr,"one")) { !strcasecmp(c->argv[2]->ptr,"one")) {