Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
de5465ba
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
de5465ba
编写于
2月 17, 2013
作者:
C
charsyam
提交者:
antirez
8月 08, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor cluster flag printing
Less copy/paste code duplication. Closes #952
上级
da013263
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
20 deletion
+36
-20
src/cluster.c
src/cluster.c
+36
-20
未找到文件。
src/cluster.c
浏览文件 @
de5465ba
...
...
@@ -73,6 +73,39 @@ void clusterCloseAllSlots(void);
void
clusterSetNodeAsMaster
(
clusterNode
*
n
);
void
clusterDelNode
(
clusterNode
*
delnode
);
struct
redisNodeFlags
{
uint16_t
flag
;
char
*
attr
;
};
static
struct
redisNodeFlags
nodeflags
[]
=
{
{
REDIS_NODE_MYSELF
,
"myself,"
},
{
REDIS_NODE_MASTER
,
"master,"
},
{
REDIS_NODE_SLAVE
,
"slave,"
},
{
REDIS_NODE_PFAIL
,
"fail?,"
},
{
REDIS_NODE_FAIL
,
"fail,"
},
{
REDIS_NODE_HANDSHAKE
,
"handshake,"
},
{
REDIS_NODE_NOADDR
,
"noaddr,"
}
};
sds
representRedisNodeFlags
(
sds
ci
,
uint16_t
flags
)
{
if
(
flags
==
0
)
{
ci
=
sdscat
(
ci
,
"noflags"
);
}
else
{
int
size
=
sizeof
(
nodeflags
)
/
sizeof
(
struct
redisNodeFlags
);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
struct
redisNodeFlags
*
nodeflag
=
nodeflags
+
i
;
if
(
flags
&
nodeflag
->
flag
)
{
ci
=
sdscat
(
ci
,
nodeflag
->
attr
);
}
}
if
(
ci
[
sdslen
(
ci
)
-
1
]
==
','
)
ci
[
sdslen
(
ci
)
-
1
]
=
' '
;
}
return
ci
;
}
/* -----------------------------------------------------------------------------
* Initialization
* -------------------------------------------------------------------------- */
...
...
@@ -1145,20 +1178,11 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
clusterNode
*
sender
=
link
->
node
?
link
->
node
:
clusterLookupNode
(
hdr
->
sender
);
while
(
count
--
)
{
sds
ci
=
sdsempty
();
uint16_t
flags
=
ntohs
(
g
->
flags
);
clusterNode
*
node
;
if
(
flags
==
0
)
ci
=
sdscat
(
ci
,
"noflags,"
);
if
(
flags
&
REDIS_NODE_MYSELF
)
ci
=
sdscat
(
ci
,
"myself,"
);
if
(
flags
&
REDIS_NODE_MASTER
)
ci
=
sdscat
(
ci
,
"master,"
);
if
(
flags
&
REDIS_NODE_SLAVE
)
ci
=
sdscat
(
ci
,
"slave,"
);
if
(
flags
&
REDIS_NODE_PFAIL
)
ci
=
sdscat
(
ci
,
"fail?,"
);
if
(
flags
&
REDIS_NODE_FAIL
)
ci
=
sdscat
(
ci
,
"fail,"
);
if
(
flags
&
REDIS_NODE_HANDSHAKE
)
ci
=
sdscat
(
ci
,
"handshake,"
);
if
(
flags
&
REDIS_NODE_NOADDR
)
ci
=
sdscat
(
ci
,
"noaddr,"
);
if
(
ci
[
sdslen
(
ci
)
-
1
]
==
','
)
ci
[
sdslen
(
ci
)
-
1
]
=
' '
;
sds
ci
=
sdsempty
();
ci
=
representRedisNodeFlags
(
ci
,
flags
);
redisLog
(
REDIS_DEBUG
,
"GOSSIP %.40s %s:%d %s"
,
g
->
nodename
,
g
->
ip
,
...
...
@@ -3355,15 +3379,7 @@ sds clusterGenNodeDescription(clusterNode *node) {
node
->
port
);
/* Flags */
if
(
node
->
flags
==
0
)
ci
=
sdscat
(
ci
,
"noflags,"
);
if
(
node
->
flags
&
REDIS_NODE_MYSELF
)
ci
=
sdscat
(
ci
,
"myself,"
);
if
(
node
->
flags
&
REDIS_NODE_MASTER
)
ci
=
sdscat
(
ci
,
"master,"
);
if
(
node
->
flags
&
REDIS_NODE_SLAVE
)
ci
=
sdscat
(
ci
,
"slave,"
);
if
(
node
->
flags
&
REDIS_NODE_PFAIL
)
ci
=
sdscat
(
ci
,
"fail?,"
);
if
(
node
->
flags
&
REDIS_NODE_FAIL
)
ci
=
sdscat
(
ci
,
"fail,"
);
if
(
node
->
flags
&
REDIS_NODE_HANDSHAKE
)
ci
=
sdscat
(
ci
,
"handshake,"
);
if
(
node
->
flags
&
REDIS_NODE_NOADDR
)
ci
=
sdscat
(
ci
,
"noaddr,"
);
if
(
ci
[
sdslen
(
ci
)
-
1
]
==
','
)
ci
[
sdslen
(
ci
)
-
1
]
=
' '
;
ci
=
representRedisNodeFlags
(
ci
,
node
->
flags
);
/* Slave of... or just "-" */
if
(
node
->
slaveof
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录