From 072c91fe133a9aec0439c2aa3d4045d86676224a Mon Sep 17 00:00:00 2001 From: antirez Date: Wed, 13 Feb 2013 18:43:40 +0100 Subject: [PATCH] PSYNC: another change to unexpected reply from PSYNC. --- src/replication.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/replication.c b/src/replication.c index 52ff1a74..3015886a 100644 --- a/src/replication.c +++ b/src/replication.c @@ -956,14 +956,11 @@ int slaveTryPartialResynchronization(int fd) { if (!runid || !offset || (offset-runid-1) != REDIS_RUN_ID_SIZE) { redisLog(REDIS_WARNING, "Master replied with wrong +FULLRESYNC syntax."); - sdsfree(reply); /* This is an unexpected condition, actually the +FULLRESYNC * reply means that the master supports PSYNC, but the reply * format seems wrong. To stay safe we blank the master - * runid to make sure next PSYNCs will fail, and return - * NOT_SUPPORTED to the caller to use SYNC instead. */ + * runid to make sure next PSYNCs will fail. */ memset(server.repl_master_runid,0,REDIS_RUN_ID_SIZE+1); - return PSYNC_NOT_SUPPORTED; } else { memcpy(server.repl_master_runid, runid, offset-runid-1); server.repl_master_runid[REDIS_RUN_ID_SIZE] = '\0';