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

Sentinel: manual failover works again.

Browse Source
This commit is contained in:
antirez 2013-11-21 12:39:47 +01:00
parent 297de1ab26
commit f55ad3038f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sentinel.c
View File

@ -2452,6 +2452,8 @@ void sentinelCommand(redisClient *c) {
addReplySds(c,sdsnew("-NOGOODSLAVE No suitable slave to promote\r\n")); addReplySds(c,sdsnew("-NOGOODSLAVE No suitable slave to promote\r\n"));
return; return;
} }
redisLog(REDIS_WARNING,"Executing user requested FAILOVER of '%s'",
ri->name);
sentinelStartFailover(ri); sentinelStartFailover(ri);
ri->flags |= SRI_FORCE_FAILOVER; ri->flags |= SRI_FORCE_FAILOVER;
addReply(c,shared.ok); addReply(c,shared.ok);
@ -3017,8 +3019,9 @@ void sentinelFailoverWaitStart(sentinelRedisInstance *ri) {
isleader = leader && strcasecmp(leader,server.runid) == 0; isleader = leader && strcasecmp(leader,server.runid) == 0;
sdsfree(leader); sdsfree(leader);
/* If I'm not the leader, I can't continue with the failover. */ /* If I'm not the leader, and it is not a forced failover via
if (!isleader) { * SENTINEL FAILOVER, then I can't continue with the failover. */
if (!isleader && !(ri->flags & SRI_FORCE_FAILOVER)) {
int election_timeout = SENTINEL_ELECTION_TIMEOUT; int election_timeout = SENTINEL_ELECTION_TIMEOUT;
/* The election timeout is the MIN between SENTINEL_ELECTION_TIMEOUT /* The election timeout is the MIN between SENTINEL_ELECTION_TIMEOUT