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

Log slave ip:port in more log messages.

Browse Source
This commit is contained in:
antirez 2014-10-27 12:30:07 +01:00
parent 775cc30a98
commit 4b8f4b90b9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/replication.c
View File

@ -369,7 +369,8 @@ int masterTryPartialResynchronization(redisClient *c) {
"Runid mismatch (Client asked for runid '%s', my runid is '%s')", "Runid mismatch (Client asked for runid '%s', my runid is '%s')",
master_runid, server.runid); master_runid, server.runid);
} else { } else {
redisLog(REDIS_NOTICE,"Full resync requested by slave."); redisLog(REDIS_NOTICE,"Full resync requested by slave %s",
replicationGetSlaveName(c));
} }
goto need_full_resync; goto need_full_resync;
} }
@ -382,10 +383,10 @@ int masterTryPartialResynchronization(redisClient *c) {
psync_offset > (server.repl_backlog_off + server.repl_backlog_histlen)) psync_offset > (server.repl_backlog_off + server.repl_backlog_histlen))
{ {
redisLog(REDIS_NOTICE, redisLog(REDIS_NOTICE,
"Unable to partial resync with the slave for lack of backlog (Slave request was: %lld).", psync_offset); "Unable to partial resync with slave %s for lack of backlog (Slave request was: %lld).", replicationGetSlaveName(c), psync_offset);
if (psync_offset > server.master_repl_offset) { if (psync_offset > server.master_repl_offset) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"Warning: slave tried to PSYNC with an offset that is greater than the master replication offset."); "Warning: slave %s tried to PSYNC with an offset that is greater than the master replication offset.", replicationGetSlaveName(c));
} }
goto need_full_resync; goto need_full_resync;
} }
@ -408,7 +409,9 @@ int masterTryPartialResynchronization(redisClient *c) {
} }
psync_len = addReplyReplicationBacklog(c,psync_offset); psync_len = addReplyReplicationBacklog(c,psync_offset);
redisLog(REDIS_NOTICE, redisLog(REDIS_NOTICE,
"Partial resynchronization request accepted. Sending %lld bytes of backlog starting from offset %lld.", psync_len, psync_offset); "Partial resynchronization request from %s accepted. Sending %lld bytes of backlog starting from offset %lld.",
replicationGetSlaveName(c),
psync_len, psync_offset);
/* Note that we don't need to set the selected DB at server.slaveseldb /* Note that we don't need to set the selected DB at server.slaveseldb
* to -1 to force the master to emit SELECT, since the slave already * to -1 to force the master to emit SELECT, since the slave already
* has this state from the previous connection with the master. */ * has this state from the previous connection with the master. */
@ -475,7 +478,8 @@ void syncCommand(redisClient *c) {
return; return;
} }
redisLog(REDIS_NOTICE,"Slave asks for synchronization"); redisLog(REDIS_NOTICE,"Slave %s asks for synchronization",
replicationGetSlaveName(c));
/* Try a partial resynchronization if this is a PSYNC command. /* Try a partial resynchronization if this is a PSYNC command.
* If it fails, we continue with usual full resynchronization, however * If it fails, we continue with usual full resynchronization, however
@ -750,7 +754,8 @@ void updateSlavesWaitingBgsave(int bgsaveerr, int type) {
if (type == REDIS_RDB_CHILD_TYPE_SOCKET) { if (type == REDIS_RDB_CHILD_TYPE_SOCKET) {
putSlaveOnline(slave); putSlaveOnline(slave);
redisLog(REDIS_NOTICE, redisLog(REDIS_NOTICE,
"Synchronization with slave succeeded (socket)"); "Synchronization with slave %s succeeded (socket)",
replicationGetSlaveName(slave));
} else { } else {
if (bgsaveerr != REDIS_OK) { if (bgsaveerr != REDIS_OK) {
freeClient(slave); freeClient(slave);