Commit 36ee294e authored by zhaozhao.zz's avatar zhaozhao.zz
Browse files

PSYNC2: reset backlog_idx and master_repl_offset correctly

parent 97f1c808
...@@ -2754,11 +2754,16 @@ void replicationCacheMasterUsingMyself(void) { ...@@ -2754,11 +2754,16 @@ void replicationCacheMasterUsingMyself(void) {
server.master_repl_offset, server.master_repl_offset,
delta); delta);
server.master_initial_offset = server.master_repl_meaningful_offset; 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_histlen -= delta;
server.repl_backlog_idx = server.repl_backlog_idx =
(server.repl_backlog_idx + (server.repl_backlog_size - delta)) % (server.repl_backlog_idx + (server.repl_backlog_size - delta)) %
server.repl_backlog_size; 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 /* The master client we create can be set to any DBID, because
......
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