Merge pull request redis#5875 from chendq8/partialsync

fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
dlzht · Mar 1, 2019 · b19e8b9 · b19e8b9
2 parents 80b8f9f + 8f7e972
commit b19e8b9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/server.c b/src/server.c
@@ -4556,7 +4556,7 @@ void loadDataFromDisk(void) {
                 (float)(ustime()-start)/1000000);
 
             /* 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_offset != -1 &&
                 /* Note that older implementations may save a repl_stream_db