diff options
| author | antirez <antirez@gmail.com> | 2020-05-27 12:08:16 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2020-05-27 12:08:16 +0200 |
| commit | 8dd017368b54b53a5e5140591878c031b1abe933 (patch) | |
| tree | a59cf1b9f72a9e5e3bfd2daa975f1718100c4e8a | |
| parent | 325409a011d0155513a71b92dc09cac06b90b261 (diff) | |
| download | redis-8dd017368b54b53a5e5140591878c031b1abe933.tar.gz | |
Revert "Clarify what is happening in PR #7320."
This reverts commit 92a3ff6168864673e806075528574d8b70fa20b0.
| -rw-r--r-- | src/replication.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/replication.c b/src/replication.c index 2b21b02d8..4e734fa51 100644 --- a/src/replication.c +++ b/src/replication.c @@ -2547,11 +2547,7 @@ void replicationUnsetMaster(void) { /* 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. - * - * NOTE: this function MUST be called after we call - * freeClient(server.master), since there we adjust the replication - * offset trimming the final PINGs. See Github issue #7320. */ + * ID is created to continue with a new replication history. */ shiftReplicationId(); /* Disconnecting all the slaves is required: we need to inform slaves * of the replication ID change (see shiftReplicationId() call). However |