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
b19e8b9a
Unverified
Commit
b19e8b9a
authored
Mar 01, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 01, 2019
Browse files
Merge pull request #5875 from chendq8/partialsync
fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
parents
80b8f9fe
8f7e9725
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
b19e8b9a
...
@@ -4556,7 +4556,7 @@ void loadDataFromDisk(void) {
...
@@ -4556,7 +4556,7 @@ void loadDataFromDisk(void) {
(
float
)(
ustime
()
-
start
)
/
1000000
);
(
float
)(
ustime
()
-
start
)
/
1000000
);
/* Restore the replication ID / offset from the RDB file. */
/* Restore the replication ID / offset from the RDB file. */
if
(
server
.
masterhost
&&
if
(
(
server
.
masterhost
||
(
server
.
cluster_enabled
&&
nodeIsSlave
(
server
.
cluster
->
myself
)))
&&
rsi
.
repl_id_is_set
&&
rsi
.
repl_id_is_set
&&
rsi
.
repl_offset
!=
-
1
&&
rsi
.
repl_offset
!=
-
1
&&
/* Note that older implementations may save a repl_stream_db
/* Note that older implementations may save a repl_stream_db
...
...
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