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

Cluster: don't add an handshake node for the same ip:port pair multiple times.

Browse Source
This commit is contained in:
antirez 2013-09-04 15:52:16 +02:00
parent 72587e6cc5
commit d0e327413b
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cluster.c
View File

@ -674,6 +674,24 @@ void clearNodeFailureIfNeeded(clusterNode *node) {
} }
} }
/* Return true if we already have a node in HANDSHAKE state matching the
* specified ip address and port number. This function is used in order to
* avoid adding a new handshake node for the same address multiple times. */
int clusterHandshakeInProgress(char *ip, int port) {
dictIterator *di;
dictEntry *de;
di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de);
if (!(node->flags & REDIS_NODE_HANDSHAKE)) continue;
if (!strcasecmp(node->ip,ip) && node->port == port) break;
}
dictReleaseIterator(di);
return de != NULL;
}
/* Process the gossip section of PING or PONG packets. /* Process the gossip section of PING or PONG packets.
* Note that this function assumes that the packet is already sanity-checked * Note that this function assumes that the packet is already sanity-checked
* by the caller, not in the content of the gossip section, but in the * by the caller, not in the content of the gossip section, but in the
@ -736,7 +754,9 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
* Note that we require that the sender of this gossip message * Note that we require that the sender of this gossip message
* is a well known node in our cluster, otherwise we risk * is a well known node in our cluster, otherwise we risk
* joining another cluster. */ * joining another cluster. */
if (sender && !(flags & REDIS_NODE_NOADDR)) { if (sender && !(flags & REDIS_NODE_NOADDR) &&
!clusterHandshakeInProgress(g->ip,ntohs(g->port)))
{
clusterNode *newnode; clusterNode *newnode;
redisLog(REDIS_DEBUG,"Adding the new node"); redisLog(REDIS_DEBUG,"Adding the new node");