Commit 02b1d521 authored by antirez's avatar antirez
Browse files

RDMF: use representClusterNodeFlags() generic name.

parent 3325a9b1
...@@ -73,7 +73,7 @@ void resetManualFailover(void); ...@@ -73,7 +73,7 @@ void resetManualFailover(void);
void clusterCloseAllSlots(void); void clusterCloseAllSlots(void);
void clusterSetNodeAsMaster(clusterNode *n); void clusterSetNodeAsMaster(clusterNode *n);
void clusterDelNode(clusterNode *delnode); void clusterDelNode(clusterNode *delnode);
sds representRedisNodeFlags(sds ci, uint16_t flags); sds representClusterNodeFlags(sds ci, uint16_t flags);
uint64_t clusterGetMaxEpoch(void); uint64_t clusterGetMaxEpoch(void);
int clusterBumpConfigEpochWithoutConsensus(void); int clusterBumpConfigEpochWithoutConsensus(void);
...@@ -1303,7 +1303,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) { ...@@ -1303,7 +1303,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
clusterNode *node; clusterNode *node;
sds ci; sds ci;
ci = representRedisNodeFlags(sdsempty(), flags); ci = representClusterNodeFlags(sdsempty(), flags);
serverLog(LL_DEBUG,"GOSSIP %.40s %s:%d %s", serverLog(LL_DEBUG,"GOSSIP %.40s %s:%d %s",
g->nodename, g->nodename,
g->ip, g->ip,
...@@ -3605,7 +3605,7 @@ static struct redisNodeFlags redisNodeFlagsTable[] = { ...@@ -3605,7 +3605,7 @@ static struct redisNodeFlags redisNodeFlagsTable[] = {
/* Concatenate the comma separated list of node flags to the given SDS /* Concatenate the comma separated list of node flags to the given SDS
* string 'ci'. */ * string 'ci'. */
sds representRedisNodeFlags(sds ci, uint16_t flags) { sds representClusterNodeFlags(sds ci, uint16_t flags) {
if (flags == 0) { if (flags == 0) {
ci = sdscat(ci,"noflags,"); ci = sdscat(ci,"noflags,");
} else { } else {
...@@ -3634,7 +3634,7 @@ sds clusterGenNodeDescription(clusterNode *node) { ...@@ -3634,7 +3634,7 @@ sds clusterGenNodeDescription(clusterNode *node) {
node->port); node->port);
/* Flags */ /* Flags */
ci = representRedisNodeFlags(ci, node->flags); ci = representClusterNodeFlags(ci, node->flags);
/* Slave of... or just "-" */ /* Slave of... or just "-" */
if (node->slaveof) if (node->slaveof)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment