summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-10-17 10:21:18 +0200
committerantirez <antirez@gmail.com>2014-10-17 10:21:18 +0200
commit80f7f63b64937df4d7f0bb53450ba281a5dd26a4 (patch)
treee5cfebd7ceea757f53096c9c9557ab304be5c645
parentf70369335d85b9fed0c4192b79e6a6bb5477ab7b (diff)
downloadredis-80f7f63b64937df4d7f0bb53450ba281a5dd26a4.tar.gz
Diskless replication: don't enter the read-payload branch forever.
-rw-r--r--src/replication.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/replication.c b/src/replication.c
index 28ecd0bd4..35a38e2e3 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -864,6 +864,9 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
usemark = 1;
memcpy(eofmark,buf+5,REDIS_RUN_ID_SIZE);
memset(lastbytes,0,REDIS_RUN_ID_SIZE);
+ /* Set any repl_transfer_size to avoid entering this code path
+ * at the next call. */
+ server.repl_transfer_size = 0;
redisLog(REDIS_NOTICE,
"MASTER <-> SLAVE sync: receiving streamed RDB from master");
} else {