Revert "PSYNC2: reset backlog_idx and master_repl_offset correctly"

This reverts commit 36ee294e83e2c1e9d8f3ec04de3b6c734185f699.

1 files changed, 5 insertions, 10 deletions

diff --git a/src/replication.c b/src/replication.c
index 12500c0af..337399e90 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -2815,16 +2815,11 @@ void replicationCacheMasterUsingMyself(void) {
                 server.master_repl_offset,
                 delta);
         server.master_initial_offset = server.master_repl_meaningful_offset;
-        server.master_repl_offset = server.master_repl_meaningful_offset;
-        if (server.repl_backlog_histlen <= delta) {
-            server.repl_backlog_histlen = 0;
-            server.repl_backlog_idx = 0;
-        } else {
-            server.repl_backlog_histlen -= delta;
-            server.repl_backlog_idx =
-                (server.repl_backlog_idx + (server.repl_backlog_size - delta)) %
-                server.repl_backlog_size;
-        }
+        server.repl_backlog_histlen -= delta;
+        server.repl_backlog_idx =
+            (server.repl_backlog_idx + (server.repl_backlog_size - delta)) %
+            server.repl_backlog_size;
+        if (server.repl_backlog_histlen < 0) server.repl_backlog_histlen = 0;
     }
 
     /* The master client we create can be set to any DBID, because