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

Fix merge conflicts from 3.2.

Browse Source
This commit is contained in:
antirez 2016-01-26 14:25:49 +01:00
parent 4d62a82b4a
commit 13f48d8dbf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cluster.c
View File

@ -531,7 +531,7 @@ void clusterReset(int hard) {
sdsfree(oldname); sdsfree(oldname);
getRandomHexChars(myself->name, REDIS_CLUSTER_NAMELEN); getRandomHexChars(myself->name, REDIS_CLUSTER_NAMELEN);
clusterAddNode(myself); clusterAddNode(myself);
serverLog(LL_NOTICE,"Node hard reset, now I'm %.40s", myself->name); redisLog(REDIS_NOTICE,"Node hard reset, now I'm %.40s", myself->name);
} }
/* Make sure to persist the new config and update the state. */ /* Make sure to persist the new config and update the state. */
@ -1341,7 +1341,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
(strcasecmp(node->ip,g->ip) || node->port != ntohs(g->port))) (strcasecmp(node->ip,g->ip) || node->port != ntohs(g->port)))
{ {
if (node->link) freeClusterLink(node->link); if (node->link) freeClusterLink(node->link);
memcpy(node->ip,g->ip,NET_IP_STR_LEN); memcpy(node->ip,g->ip,REDIS_IP_STR_LEN);
node->port = ntohs(g->port); node->port = ntohs(g->port);
node->flags &= ~REDIS_NODE_NOADDR; node->flags &= ~REDIS_NODE_NOADDR;
} }
@ -1725,7 +1725,7 @@ int clusterProcessPacket(clusterLink *link) {
link->node->name, link->node->name,
(int)(mstime()-(link->node->ctime)), (int)(mstime()-(link->node->ctime)),
link->node->flags); link->node->flags);
link->node->flags |= CLUSTER_NODE_NOADDR; link->node->flags |= REDIS_NODE_NOADDR;
link->node->ip[0] = '\0'; link->node->ip[0] = '\0';
link->node->port = 0; link->node->port = 0;
freeClusterLink(link); freeClusterLink(link);