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

Cluster: clusterBroadcastPong() improved with target selection.

Browse Source 
Now we can broadcast a pong to all the instances or just the local
slaves (that is useful for replication offset propagation).
This commit is contained in:
antirez 2014-01-29 11:08:52 +01:00
parent befcf6259e
commit f1e09d8c41
1 changed files with 20 additions and 3 deletions

23
src/cluster.c

@ -1737,10 +1737,20 @@ void clusterSendPing(clusterLink *link, int type) {
* In Redis Cluster pongs are not used just for failure detection, but also * In Redis Cluster pongs are not used just for failure detection, but also
* to carry important configuration information. So broadcasting a pong is * to carry important configuration information. So broadcasting a pong 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 clusterBroadcastPong(void) { *
* The 'target' argument specifies the receiving instances using the
* defines below:
*
* CLUSTER_BROADCAST_ALL -> All known instances.
* CLUSTER_BROADCAST_LOCAL_SLAVES -> All slaves in my master-slaves ring.
*/
#define CLUSTER_BROADCAST_ALL 0
#define CLUSTER_BROADCAST_LOCAL_SLAVES 1
void clusterBroadcastPong(int target) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
clusterNode *myself = server.cluster->myself;
di = dictGetSafeIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
@ -1748,6 +1758,13 @@ void clusterBroadcastPong(void) {
if (!node->link) continue; if (!node->link) continue;
if (node->flags & (REDIS_NODE_MYSELF|REDIS_NODE_HANDSHAKE)) continue; if (node->flags & (REDIS_NODE_MYSELF|REDIS_NODE_HANDSHAKE)) continue;
if (target == CLUSTER_BROADCAST_LOCAL_SLAVES) {
int local_slave =
node->flags & REDIS_NODE_SLAVE &&
node->slaveof &&
(node->slaveof == myself || node->slaveof == myself->slaveof);
if (!local_slave) continue;
}
clusterSendPing(node->link,CLUSTERMSG_TYPE_PONG); clusterSendPing(node->link,CLUSTERMSG_TYPE_PONG);
} }
dictReleaseIterator(di); dictReleaseIterator(di);
@ -2038,7 +2055,7 @@ void clusterHandleSlaveFailover(void) {
/* 5) Pong all the other nodes so that they can update the state /* 5) 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. */
clusterBroadcastPong(); clusterBroadcastPong(CLUSTER_BROADCAST_ALL);
} }
} }