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

Cluster: process config from PING packets as we do for PONG.

Browse Source 
Also clusterBroadcastPing() was renamed into clusterBroadcastPong()
that's what the function is actually doing.
This commit is contained in:
antirez 2013-04-11 18:19:48 +02:00
parent 8a51c067ad
commit a120560f70
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cluster.c
View File

@ -807,8 +807,9 @@ int clusterProcessPacket(clusterLink *link) {
if (totlen != explen) return 1; if (totlen != explen) return 1;
} }
/* Ready to process the packet. Dispatch by type. */ /* Process packets by type. */
sender = clusterLookupNode(hdr->sender); sender = clusterLookupNode(hdr->sender);
if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_MEET) { if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_MEET) {
int update_config = 0; int update_config = 0;
redisLog(REDIS_DEBUG,"Ping packet received: %p", (void*)link->node); redisLog(REDIS_DEBUG,"Ping packet received: %p", (void*)link->node);
@ -835,11 +836,16 @@ int clusterProcessPacket(clusterLink *link) {
/* Update config if needed */ /* Update config if needed */
if (update_config) clusterSaveConfigOrDie(); if (update_config) clusterSaveConfigOrDie();
} else if (type == CLUSTERMSG_TYPE_PONG) { }
/* PING or PONG: process config information. */
if (type == CLUSTERMSG_TYPE_PING || type == CLUSTERMSG_TYPE_PONG) {
int update_state = 0; int update_state = 0;
int update_config = 0; int update_config = 0;
redisLog(REDIS_DEBUG,"Pong packet received: %p", (void*)link->node); redisLog(REDIS_DEBUG,"%s packet received: %p",
type == CLUSTERMSG_TYPE_PING ? "ping" : "pong",
(void*)link->node);
if (link->node) { if (link->node) {
if (link->node->flags & REDIS_NODE_HANDSHAKE) { if (link->node->flags & REDIS_NODE_HANDSHAKE) {
/* If we already have this node, try to change the /* If we already have this node, try to change the
@ -1253,14 +1259,13 @@ void clusterSendPing(clusterLink *link, int type) {
clusterSendMessage(link,buf,totlen); clusterSendMessage(link,buf,totlen);
} }
/* Send a PING packet to every connected node that's not in handshake state. /* Send a PONG packet to every connected node that's not in handshake state.
* *
* Usually cluster nodes will ping just another node every second, however * In Redis Cluster pings are not just used for failure detection, but also
* in Redis Cluster pings are not just used for failure detection, but also * to carry important configuration informations. So broadcasting a pong is
* to carry important configuration informations. So broadcasting a ping is
* useful when something changes in the configuration and we want to make * useful when something changes in the configuration and we want to make
* the cluster aware ASAP (for instance after a slave promotion). */ * the cluster aware ASAP (for instance after a slave promotion). */
void clusterBroadcastPing(void) { void clusterBroadcastPong(void) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
@ -1478,9 +1483,9 @@ void clusterHandleSlaveFailover(void) {
} }
} }
/* 3) Ping all the other nodes so that they can update the state /* 3) Pong all the other nodes so that they can update the state
* accordingly and detect that we switched to master role. */ * accordingly and detect that we switched to master role. */
clusterBroadcastPing(); clusterBroadcastPong();
/* 4) Update state and save config. */ /* 4) Update state and save config. */
clusterUpdateState(); clusterUpdateState();