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

Sentinel: distinguish between is-master-down-by-addr requests.

Browse Source 
Some are just to know if the master is down, and in this case the runid
in the request is set to "*", others are actually in order to seek for a
vote and get elected. In the latter case the runid is set to the runid
of the instance seeking for the vote.
This commit is contained in:
antirez 2013-11-19 16:50:04 +01:00
parent b22d1beea0
commit 37a51a2568
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.c
View File

@ -3108,6 +3108,8 @@ int main(int argc, char **argv) {
redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port); redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
if (server.sofd > 0) if (server.sofd > 0)
redisLog(REDIS_NOTICE,"The server is now ready to accept connections at %s", server.unixsocket); redisLog(REDIS_NOTICE,"The server is now ready to accept connections at %s", server.unixsocket);
} else {
redisLog(REDIS_WARNING,"Sentinel runid is %s", server.runid);
} }
/* Warning the user about suspicious maxmemory setting. */ /* Warning the user about suspicious maxmemory setting. */

20
src/sentinel.c
View File

@ -2359,8 +2359,9 @@ void sentinelCommand(redisClient *c) {
(ri->flags & SRI_MASTER)) (ri->flags & SRI_MASTER))
isdown = 1; isdown = 1;
/* Vote for the master (or fetch the previous vote) */ /* Vote for the master (or fetch the previous vote) if the request
if (ri && ri->flags & SRI_MASTER) { * includes a runid, otherwise the sender is not seeking for a vote. */
if (ri && ri->flags & SRI_MASTER && strcasecmp(c->argv[5]->ptr,"*")) {
leader = sentinelVoteLeader(ri,(uint64_t)req_epoch, leader = sentinelVoteLeader(ri,(uint64_t)req_epoch,
c->argv[5]->ptr, c->argv[5]->ptr,
&leader_epoch); &leader_epoch);
@ -2370,7 +2371,7 @@ void sentinelCommand(redisClient *c) {
* down state, leader, vote epoch. */ * down state, leader, vote epoch. */
addReplyMultiBulkLen(c,3); addReplyMultiBulkLen(c,3);
addReply(c, isdown ? shared.cone : shared.czero); addReply(c, isdown ? shared.cone : shared.czero);
addReplyBulkCString(c, leader ? leader : "?"); addReplyBulkCString(c, leader ? leader : "*");
addReplyLongLong(c, (long long)leader_epoch); addReplyLongLong(c, (long long)leader_epoch);
if (leader) sdsfree(leader); if (leader) sdsfree(leader);
} else if (!strcasecmp(c->argv[1]->ptr,"reset")) { } else if (!strcasecmp(c->argv[1]->ptr,"reset")) {
@ -2605,9 +2606,13 @@ void sentinelReceiveIsMasterDownReply(redisAsyncContext *c, void *reply, void *p
} else { } else {
ri->flags &= ~SRI_MASTER_DOWN; ri->flags &= ~SRI_MASTER_DOWN;
} }
sdsfree(ri->leader); if (strcmp(r->element[1]->str,"*")) {
ri->leader = sdsnew(r->element[1]->str); /* If the runid in the reply is not "*" the Sentinel actually
ri->leader_epoch = r->element[2]->integer; * replied with a vote. */
sdsfree(ri->leader);
ri->leader = sdsnew(r->element[1]->str);
ri->leader_epoch = r->element[2]->integer;
}
} }
} }
@ -2660,7 +2665,8 @@ void sentinelAskMasterStateToOtherSentinels(sentinelRedisInstance *master, int f
"SENTINEL is-master-down-by-addr %s %s %llu %s", "SENTINEL is-master-down-by-addr %s %s %llu %s",
master->addr->ip, port, master->addr->ip, port,
sentinel.current_epoch, sentinel.current_epoch,
server.runid); (master->failover_state > SENTINEL_FAILOVER_STATE_NONE) ?
server.runid : "*");
if (retval == REDIS_OK) ri->pending_commands++; if (retval == REDIS_OK) ri->pending_commands++;
} }
dictReleaseIterator(di); dictReleaseIterator(di);