Commit 316a8f15 authored by antirez's avatar antirez
Browse files

PSYNC2: fix backlog_idx when adjusting for meaningful offset

See #7002.
parent 11db53f8
...@@ -2755,6 +2755,9 @@ void replicationCacheMasterUsingMyself(void) { ...@@ -2755,6 +2755,9 @@ void replicationCacheMasterUsingMyself(void) {
delta); delta);
server.master_initial_offset = server.master_repl_meaningful_offset; server.master_initial_offset = server.master_repl_meaningful_offset;
server.repl_backlog_histlen -= delta; 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; if (server.repl_backlog_histlen < 0) server.repl_backlog_histlen = 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment