Merge pull request #5875 from chendq8/partialsync

fix:Slave will do full sync when restart with SHUTDOWN SAVE on cluster mode
This commit is contained in:
Salvatore Sanfilippo 2019-03-01 17:29:19 +01:00 committed by GitHub
commit b19e8b9a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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