gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PSYNC: debugging printf() calls are now logs at DEBUG level.

Browse Source
This commit is contained in:
antirez 2013-02-09 16:33:57 +01:00
parent 89b48f0825
commit 3af478e9ef
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/replication.c
View File

@ -333,27 +333,32 @@ void replicationFeedMonitors(redisClient *c, list *monitors, int dictid, robj **
long long addReplyReplicationBacklog(redisClient *c, long long offset) { long long addReplyReplicationBacklog(redisClient *c, long long offset) {
long long j, skip, len; long long j, skip, len;
// printf("SLAVE REQUEST %lld\n", offset); redisLog(REDIS_DEBUG, "[PSYNC] Slave request offset: %lld", offset);
if (server.repl_backlog_histlen == 0) { if (server.repl_backlog_histlen == 0) {
// printf("NO HISTORY\n"); redisLog(REDIS_DEBUG, "[PSYNC] Backlog history len is zero");
return 0; return 0;
} }
// printf("FIRST BYTE WE HAVE %lld\n", server.repl_backlog_off); redisLog(REDIS_DEBUG, "[PSYNC] Backlog size: %lld",
// printf("HISTLEN %lld\n", server.repl_backlog_histlen); server.repl_backlog_size);
// printf("IDX %lld\n", server.repl_backlog_idx); redisLog(REDIS_DEBUG, "[PSYNC] First byte: %lld",
server.repl_backlog_off);
redisLog(REDIS_DEBUG, "[PSYNC] History len: %lld",
server.repl_backlog_histlen);
redisLog(REDIS_DEBUG, "[PSYNC] Current index: %lld",
server.repl_backlog_idx);
/* Compute the amount of bytes we need to discard. */ /* Compute the amount of bytes we need to discard. */
skip = offset - server.repl_backlog_off; skip = offset - server.repl_backlog_off;
// printf("SKIP %lld\n", skip); redisLog(REDIS_DEBUG, "[PSYNC] Skipping: %lld", skip);
/* Point j to the oldest byte, that is actaully our /* Point j to the oldest byte, that is actaully our
* server.repl_backlog_off byte. */ * server.repl_backlog_off byte. */
j = (server.repl_backlog_idx + j = (server.repl_backlog_idx +
(server.repl_backlog_size-server.repl_backlog_histlen)) % (server.repl_backlog_size-server.repl_backlog_histlen)) %
server.repl_backlog_size; server.repl_backlog_size;
// printf("J %lld\n", j); redisLog(REDIS_DEBUG, "[PSYNC] Index of first byte: %lld", j);
/* Discard the amount of data to seek to the specified 'offset'. */ /* Discard the amount of data to seek to the specified 'offset'. */
j = (j + skip) % server.repl_backlog_size; j = (j + skip) % server.repl_backlog_size;
@ -361,13 +366,13 @@ long long addReplyReplicationBacklog(redisClient *c, long long offset) {
/* Feed slave with data. Since it is a circular buffer we have to /* Feed slave with data. Since it is a circular buffer we have to
* split the reply in two parts if we are cross-boundary. */ * split the reply in two parts if we are cross-boundary. */
len = server.repl_backlog_histlen - skip; len = server.repl_backlog_histlen - skip;
// printf("LEN %lld\n", len); redisLog(REDIS_DEBUG, "[PSYNC] Reply total length: %lld", len);
while(len) { while(len) {
long long thislen = long long thislen =
((server.repl_backlog_size - j) < len) ? ((server.repl_backlog_size - j) < len) ?
(server.repl_backlog_size - j) : len; (server.repl_backlog_size - j) : len;
// printf("WRITE %lld\n", thislen); redisLog(REDIS_DEBUG, "[PSYNC] addReply() length: %lld", thislen);
addReplySds(c,sdsnewlen(server.repl_backlog + j, thislen)); addReplySds(c,sdsnewlen(server.repl_backlog + j, thislen));
len -= thislen; len -= thislen;
j = 0; j = 0;