Unverified Commit b19e8b9a authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
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
...@@ -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
......
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