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
2ca21753
Commit
2ca21753
authored
Feb 27, 2019
by
chendianqiang
Committed by
antirez
Mar 01, 2019
Browse files
fix replicationid will not change for server.masterhost==NULL in cluster mode when restart slave
parent
44c5bce0
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
2ca21753
...
@@ -3859,7 +3859,7 @@ void loadDataFromDisk(void) {
...
@@ -3859,7 +3859,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