fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-06 17:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Return from syncWithMaster() ASAP if the event fired but the instance is no longer a slave. This should fix Issue #145.

Browse Source
This commit is contained in:
antirez 2011-10-18 11:09:32 +02:00
parent 6856c7b4d6
commit 76e772f39a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/replication.c
View File

@ -376,6 +376,13 @@ void syncWithMaster(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
/* If this event fired after the user turned the instance into a master
* with SLAVEOF NO ONE we must just return ASAP. */
if (server.replstate == REDIS_REPL_NONE) {
close(fd);
return;
}
redisLog(REDIS_NOTICE,"Non blocking connect for SYNC fired the event."); redisLog(REDIS_NOTICE,"Non blocking connect for SYNC fired the event.");
/* This event should only be triggered once since it is used to have a /* This event should only be triggered once since it is used to have a
* non-blocking connect(2) to the master. It has been triggered when this * non-blocking connect(2) to the master. It has been triggered when this