Skip to content

Commit 072c91f

Browse files
committed
PSYNC: another change to unexpected reply from PSYNC.
1 parent 0e1be53 commit 072c91f

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/replication.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -956,14 +956,11 @@ int slaveTryPartialResynchronization(int fd) {
956956
if (!runid || !offset || (offset-runid-1) != REDIS_RUN_ID_SIZE) {
957957
redisLog(REDIS_WARNING,
958958
"Master replied with wrong +FULLRESYNC syntax.");
959-
sdsfree(reply);
960959
/* This is an unexpected condition, actually the +FULLRESYNC
961960
* reply means that the master supports PSYNC, but the reply
962961
* format seems wrong. To stay safe we blank the master
963-
* runid to make sure next PSYNCs will fail, and return
964-
* NOT_SUPPORTED to the caller to use SYNC instead. */
962+
* runid to make sure next PSYNCs will fail. */
965963
memset(server.repl_master_runid,0,REDIS_RUN_ID_SIZE+1);
966-
return PSYNC_NOT_SUPPORTED;
967964
} else {
968965
memcpy(server.repl_master_runid, runid, offset-runid-1);
969966
server.repl_master_runid[REDIS_RUN_ID_SIZE] = '\0';

0 commit comments

Comments
 (0)