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

Cluster: there is a lower limit for the handshake timeout.

Browse Source
This commit is contained in:
antirez 2013-10-11 10:34:32 +02:00
parent 1447d28c0f
commit 0c9f60a628
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cluster.c
View File

@ -1743,9 +1743,17 @@ void clusterCron(void) {
mstime_t min_pong = 0, now = mstime(); mstime_t min_pong = 0, now = mstime();
clusterNode *min_pong_node = NULL; clusterNode *min_pong_node = NULL;
static unsigned long long iteration = 0; static unsigned long long iteration = 0;
mstime_t handshake_timeout;
iteration++; /* Number of times this function was called so far. */ iteration++; /* Number of times this function was called so far. */
/* The handshake timeout is the time after which an handshake node that was
* not turned into a normal node is removed from the nodes. Usually it is
* just the NODE_TIMEOUT value, but when NODE_TIMEOUT is too small we use
* the value of 1 second. */
handshake_timeout = server.cluster_node_timeout;
if (handshake_timeout < 1000) handshake_timeout = 1000;
/* Check if we have disconnected nodes and re-establish the connection. */ /* Check if we have disconnected nodes and re-establish the connection. */
di = dictGetSafeIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
@ -1756,7 +1764,7 @@ void clusterCron(void) {
/* A Node in HANDSHAKE state has a limited lifespan equal to the /* A Node in HANDSHAKE state has a limited lifespan equal to the
* configured node timeout. */ * configured node timeout. */
if (node->flags & REDIS_NODE_HANDSHAKE && if (node->flags & REDIS_NODE_HANDSHAKE &&
now - node->ctime > server.cluster_node_timeout) now - node->ctime > handshake_timeout)
{ {
freeClusterNode(node); freeClusterNode(node);
continue; continue;