Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
8f52173b
R
redis
项目概览
xindoo
/
redis
通知
2
Star
2
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,发现更多精彩内容 >>
提交
8f52173b
编写于
3月 27, 2014
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cluster: last_vote_epoch -> lastVoteEpoch.
Use cammel case for epochs that are persisted on disk.
上级
7fb14b73
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
9 deletion
+9
-9
src/cluster.c
src/cluster.c
+8
-8
src/cluster.h
src/cluster.h
+1
-1
未找到文件。
src/cluster.c
浏览文件 @
8f52173b
...
...
@@ -128,8 +128,8 @@ int clusterLoadConfig(char *filename) {
if
(
strcasecmp
(
argv
[
j
],
"currentEpoch"
)
==
0
)
{
server
.
cluster
->
currentEpoch
=
strtoull
(
argv
[
j
+
1
],
NULL
,
10
);
}
else
if
(
strcasecmp
(
argv
[
j
],
"last
_vote_e
poch"
)
==
0
)
{
server
.
cluster
->
last
_vote_e
poch
=
}
else
if
(
strcasecmp
(
argv
[
j
],
"last
VoteE
poch"
)
==
0
)
{
server
.
cluster
->
last
VoteE
poch
=
strtoull
(
argv
[
j
+
1
],
NULL
,
10
);
}
else
{
redisLog
(
REDIS_WARNING
,
...
...
@@ -281,11 +281,11 @@ int clusterSaveConfig(int do_fsync) {
int
fd
;
/* Get the nodes description and concatenate our "vars" directive to
* save currentEpoch and last
_vote_e
poch. */
* save currentEpoch and last
VoteE
poch. */
ci
=
clusterGenNodesDescription
(
REDIS_NODE_HANDSHAKE
);
ci
=
sdscatprintf
(
ci
,
"vars currentEpoch %llu last
_vote_e
poch %llu
\n
"
,
ci
=
sdscatprintf
(
ci
,
"vars currentEpoch %llu last
VoteE
poch %llu
\n
"
,
(
unsigned
long
long
)
server
.
cluster
->
currentEpoch
,
(
unsigned
long
long
)
server
.
cluster
->
last
_vote_e
poch
);
(
unsigned
long
long
)
server
.
cluster
->
last
VoteE
poch
);
content_size
=
sdslen
(
ci
);
if
((
fd
=
open
(
server
.
cluster_configfile
,
O_WRONLY
|
O_CREAT
,
0644
))
...
...
@@ -339,7 +339,7 @@ void clusterInit(void) {
server
.
cluster
->
failover_auth_count
=
0
;
server
.
cluster
->
failover_auth_rank
=
0
;
server
.
cluster
->
failover_auth_epoch
=
0
;
server
.
cluster
->
last
_vote_e
poch
=
0
;
server
.
cluster
->
last
VoteE
poch
=
0
;
server
.
cluster
->
stats_bus_messages_sent
=
0
;
server
.
cluster
->
stats_bus_messages_received
=
0
;
memset
(
server
.
cluster
->
slots
,
0
,
sizeof
(
server
.
cluster
->
slots
));
...
...
@@ -2134,7 +2134,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) {
if
(
requestCurrentEpoch
<
server
.
cluster
->
currentEpoch
)
return
;
/* I already voted for this epoch? Return ASAP. */
if
(
server
.
cluster
->
last
_vote_e
poch
==
server
.
cluster
->
currentEpoch
)
return
;
if
(
server
.
cluster
->
last
VoteE
poch
==
server
.
cluster
->
currentEpoch
)
return
;
/* Node must be a slave and its master down.
* The master can be non failing if the request is flagged
...
...
@@ -2166,7 +2166,7 @@ void clusterSendFailoverAuthIfNeeded(clusterNode *node, clusterMsg *request) {
/* We can vote for this slave. */
clusterSendFailoverAuth
(
node
);
server
.
cluster
->
last
_vote_e
poch
=
server
.
cluster
->
currentEpoch
;
server
.
cluster
->
last
VoteE
poch
=
server
.
cluster
->
currentEpoch
;
node
->
slaveof
->
voted_time
=
mstime
();
}
...
...
src/cluster.h
浏览文件 @
8f52173b
...
...
@@ -118,7 +118,7 @@ typedef struct clusterState {
int
mf_can_start
;
/* If non-zero signal that the manual failover
can start requesting masters vote. */
/* The followign fields are uesd by masters to take state on elections. */
uint64_t
last
_vote_epoch
;
/* Epoch of the last vote granted. */
uint64_t
last
VoteEpoch
;
/* Epoch of the last vote granted. */
int
todo_before_sleep
;
/* Things to do in clusterBeforeSleep(). */
long
long
stats_bus_messages_sent
;
/* Num of msg sent via cluster bus. */
long
long
stats_bus_messages_received
;
/* Num of msg rcvd via cluster bus.*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录