From eec769be59d2100748bbb45a0e97e7834f490d4a Mon Sep 17 00:00:00 2001 From: "zhaozhao.zz" Date: Mon, 25 May 2020 11:17:51 +0800 Subject: [PATCH] PSYNC2: second_replid_offset should be real meaningful offset After adjustMeaningfulReplOffset(), all the other related variable should be updated, including server.second_replid_offset. Or the old version redis like 5.0 may receive wrong data from replication stream, cause redis 5.0 can sync with redis 6.0, but doesn't know meaningful offset. --- src/replication.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/replication.c b/src/replication.c index e1c65d48b..d45a15783 100644 --- a/src/replication.c +++ b/src/replication.c @@ -2531,14 +2531,14 @@ void replicationUnsetMaster(void) { sdsfree(server.masterhost); server.masterhost = NULL; + if (server.master) freeClient(server.master); + replicationDiscardCachedMaster(); + cancelReplicationHandshake(); /* When a slave is turned into a master, the current replication ID * (that was inherited from the master at synchronization time) is * used as secondary ID up to the current offset, and a new replication * ID is created to continue with a new replication history. */ shiftReplicationId(); - if (server.master) freeClient(server.master); - replicationDiscardCachedMaster(); - cancelReplicationHandshake(); /* Disconnecting all the slaves is required: we need to inform slaves * of the replication ID change (see shiftReplicationId() call). However * the slaves will be able to partially resync with us, so it will be