Merge pull request #5875 from chendq8/partialsync

fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
2019-03-01 17:29:19 +01:00 · 2019-03-01 17:29:19 +01:00 · b19e8b9a2c
parent 80b8f9febc 8f7e97258b
commit b19e8b9a2c
1 changed files with 1 additions and 1 deletions
--- 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