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

when loading config set the ping/pong timestaps to the current value. Even a node in FAIL state can be accepted again if there are no slaves for this node so election was not possible

Browse Source
This commit is contained in:
antirez 2011-04-07 23:06:01 +02:00
parent 1793752d97
commit 152d937b8c
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cluster.c
View File

@ -107,6 +107,10 @@ int clusterLoadConfig(char *filename) {
clusterNodeAddSlave(master,n); clusterNodeAddSlave(master,n);
} }
/* Set ping sent / pong received timestamps */
if (atoi(argv[4])) n->ping_sent = time(NULL);
if (atoi(argv[5])) n->pong_received = time(NULL);
/* Populate hash slots served by this instance. */ /* Populate hash slots served by this instance. */
for (j = 7; j < argc; j++) { for (j = 7; j < argc; j++) {
int start, stop; int start, stop;
@ -923,14 +927,25 @@ void clusterCron(void) {
node->ping_sent <= node->pong_received) continue; node->ping_sent <= node->pong_received) continue;
delay = time(NULL) - node->pong_received; delay = time(NULL) - node->pong_received;
if (node->flags & REDIS_NODE_PFAIL) { if (delay < server.cluster.node_timeout) {
/* The PFAIL condition can be reversed without external /* The PFAIL condition can be reversed without external
* help if it is not transitive (that is, if it does not * help if it is not transitive (that is, if it does not
* turn into a FAIL state). */ * turn into a FAIL state).
if (delay < server.cluster.node_timeout) *
* The FAIL condition is also reversible if there are no slaves
* for this host, so no slave election should be in progress.
*
* TODO: consider all the implications of resurrecting a
* FAIL node. */
if (node->flags & REDIS_NODE_PFAIL) {
node->flags &= ~REDIS_NODE_PFAIL; node->flags &= ~REDIS_NODE_PFAIL;
} else if (node->flags & REDIS_NODE_FAIL && !node->numslaves) {
node->flags &= ~REDIS_NODE_FAIL;
}
} else { } else {
if (delay >= server.cluster.node_timeout) { /* Timeout reached. Set the noad se possibly failing if it is
* not already in this state. */
if (!(node->flags & REDIS_NODE_PFAIL)) {
redisLog(REDIS_DEBUG,"*** NODE %.40s possibly failing", redisLog(REDIS_DEBUG,"*** NODE %.40s possibly failing",
node->name); node->name);
node->flags |= REDIS_NODE_PFAIL; node->flags |= REDIS_NODE_PFAIL;