Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
e8afadd5
Unverified
Commit
e8afadd5
authored
Mar 28, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 28, 2020
Browse files
Merge pull request #7032 from soloestoy/psync2-meaningful-offset-bugfix
PSYNC2: reset backlog_idx and master_repl_offset correctly
parents
97f1c808
36ee294e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
e8afadd5
...
...
@@ -2754,11 +2754,16 @@ void replicationCacheMasterUsingMyself(void) {
server
.
master_repl_offset
,
delta
);
server
.
master_initial_offset
=
server
.
master_repl_meaningful_offset
;
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
;
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
;
}
}
/* The master client we create can be set to any DBID, because
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment