Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
02b1d521
Commit
02b1d521
authored
Jul 27, 2015
by
antirez
Browse files
RDMF: use representClusterNodeFlags() generic name.
parent
3325a9b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
02b1d521
...
...
@@ -73,7 +73,7 @@ void resetManualFailover(void);
void
clusterCloseAllSlots
(
void
);
void
clusterSetNodeAsMaster
(
clusterNode
*
n
);
void
clusterDelNode
(
clusterNode
*
delnode
);
sds
represent
Redis
NodeFlags
(
sds
ci
,
uint16_t
flags
);
sds
represent
Cluster
NodeFlags
(
sds
ci
,
uint16_t
flags
);
uint64_t
clusterGetMaxEpoch
(
void
);
int
clusterBumpConfigEpochWithoutConsensus
(
void
);
...
...
@@ -1303,7 +1303,7 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
clusterNode
*
node
;
sds
ci
;
ci
=
represent
Redis
NodeFlags
(
sdsempty
(),
flags
);
ci
=
represent
Cluster
NodeFlags
(
sdsempty
(),
flags
);
serverLog
(
LL_DEBUG
,
"GOSSIP %.40s %s:%d %s"
,
g
->
nodename
,
g
->
ip
,
...
...
@@ -3605,7 +3605,7 @@ static struct redisNodeFlags redisNodeFlagsTable[] = {
/* Concatenate the comma separated list of node flags to the given SDS
* string 'ci'. */
sds
represent
Redis
NodeFlags
(
sds
ci
,
uint16_t
flags
)
{
sds
represent
Cluster
NodeFlags
(
sds
ci
,
uint16_t
flags
)
{
if
(
flags
==
0
)
{
ci
=
sdscat
(
ci
,
"noflags,"
);
}
else
{
...
...
@@ -3634,7 +3634,7 @@ sds clusterGenNodeDescription(clusterNode *node) {
node
->
port
);
/* Flags */
ci
=
represent
Redis
NodeFlags
(
ci
,
node
->
flags
);
ci
=
represent
Cluster
NodeFlags
(
ci
,
node
->
flags
);
/* Slave of... or just "-" */
if
(
node
->
slaveof
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment