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

Add some comments in syncCommand() to clarify RDB target.

Browse Source
This commit is contained in:
antirez 2014-10-10 16:25:58 +02:00
parent 2df8341c75
commit 16546f5aca
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/replication.c
View File

@ -468,7 +468,7 @@ void syncCommand(redisClient *c) {
if (server.rdb_child_pid != -1) { if (server.rdb_child_pid != -1) {
/* Ok a background save is in progress. Let's check if it is a good /* Ok a background save is in progress. Let's check if it is a good
* one for replication, i.e. if there is another slave that is * one for replication, i.e. if there is another slave that is
* registering differences since the server forked to save */ * registering differences since the server forked to save. */
redisClient *slave; redisClient *slave;
listNode *ln; listNode *ln;
listIter li; listIter li;
@ -480,18 +480,23 @@ void syncCommand(redisClient *c) {
} }
if (ln) { if (ln) {
/* Perfect, the server is already registering differences for /* Perfect, the server is already registering differences for
* another slave. Set the right state, and copy the buffer. */ * another slave. Set the right state, and copy the buffer.
*
* Note that if we found a slave in WAIT_BGSAVE_END state, this
* means that the current child is of type
* REDIS_RDB_CHILD_TYPE_DISK, since the first slave in this state
* can only be added when an RDB save with disk target is started. */
copyClientOutputBuffer(c,slave); copyClientOutputBuffer(c,slave);
c->replstate = REDIS_REPL_WAIT_BGSAVE_END; c->replstate = REDIS_REPL_WAIT_BGSAVE_END;
redisLog(REDIS_NOTICE,"Waiting for end of BGSAVE for SYNC"); redisLog(REDIS_NOTICE,"Waiting for end of BGSAVE for SYNC");
} else { } else {
/* No way, we need to wait for the next BGSAVE in order to /* No way, we need to wait for the next BGSAVE in order to
* register differences */ * register differences. */
c->replstate = REDIS_REPL_WAIT_BGSAVE_START; c->replstate = REDIS_REPL_WAIT_BGSAVE_START;
redisLog(REDIS_NOTICE,"Waiting for next BGSAVE for SYNC"); redisLog(REDIS_NOTICE,"Waiting for next BGSAVE for SYNC");
} }
} else { } else {
/* Ok we don't have a BGSAVE in progress, let's start one */ /* Ok we don't have a BGSAVE in progress, let's start one. */
redisLog(REDIS_NOTICE,"Starting BGSAVE for SYNC"); redisLog(REDIS_NOTICE,"Starting BGSAVE for SYNC");
if (rdbSaveBackground(server.rdb_filename) != REDIS_OK) { if (rdbSaveBackground(server.rdb_filename) != REDIS_OK) {
redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE"); redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE");