From b75ae0bbea794dbfd6549d308ab29f9b963e0722 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 19 Sep 2017 10:33:14 +0200 Subject: PSYNC2: Create backlog on slave partial sync as well. A slave may be started with an RDB file able to provide enough slave to perform a successful partial SYNC with its master. However in such a case, how outlined in issue #4268, the slave backlog will not be started, since it was only initialized on full syncs attempts. This creates different problems with successive PSYNC attempts that will always result in full synchronizations. Thanks to @fdingiit for discovering the issue. --- src/replication.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/replication.c b/src/replication.c index 6be5d2631..97ce9608d 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1531,6 +1531,11 @@ int slaveTryPartialResynchronization(int fd, int read_reply) { /* Setup the replication to continue. */ sdsfree(reply); replicationResurrectCachedMaster(fd); + + /* If this instance was restarted and we read the metadata to + * PSYNC from the persistence file, our replication backlog could + * be still not initialized. Create it. */ + if (server.repl_backlog == NULL) createReplicationBacklog(); return PSYNC_CONTINUE; } -- cgit v1.2.1