Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
dbdfee4c
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
dbdfee4c
编写于
8月 15, 2023
作者:
B
Benguang Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: update SVnodeGid of vnode info in mndProcessStatusReq
上级
239a79d4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
7 deletion
+13
-7
source/dnode/mnode/impl/inc/mndDef.h
source/dnode/mnode/impl/inc/mndDef.h
+3
-0
source/dnode/mnode/impl/src/mndDnode.c
source/dnode/mnode/impl/src/mndDnode.c
+10
-7
未找到文件。
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @
dbdfee4c
...
...
@@ -347,8 +347,11 @@ typedef struct {
typedef
struct
{
int32_t
dnodeId
;
ESyncState
syncState
;
int64_t
syncTerm
;
bool
syncRestore
;
bool
syncCanRead
;
int64_t
roleTimeMs
;
int64_t
startTimeMs
;
ESyncRole
nodeRole
;
}
SVnodeGid
;
...
...
source/dnode/mnode/impl/src/mndDnode.c
浏览文件 @
dbdfee4c
...
...
@@ -500,17 +500,22 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
for
(
int32_t
vg
=
0
;
vg
<
pVgroup
->
replica
;
++
vg
)
{
SVnodeGid
*
pGid
=
&
pVgroup
->
vnodeGid
[
vg
];
if
(
pGid
->
dnodeId
==
statusReq
.
dnodeId
)
{
if
(
pGid
->
syncState
!=
pVload
->
syncState
||
pGid
->
syncRestore
!=
pVload
->
syncRestore
||
pGid
->
syncCanRead
!=
pVload
->
syncCanRead
)
{
roleChanged
=
pGid
->
syncState
!=
pVload
->
syncState
||
(
pVload
->
syncTerm
!=
-
1
&&
pGid
->
syncTerm
!=
pVload
->
syncTerm
);
if
(
reboot
||
roleChanged
||
pGid
->
syncRestore
!=
pVload
->
syncRestore
||
pGid
->
syncCanRead
!=
pVload
->
syncCanRead
)
{
mInfo
(
"vgId:%d, state changed by status msg, old state:%s restored:%d canRead:%d new state:%s restored:%d "
"canRead:%d, dnode:%d"
,
pVgroup
->
vgId
,
syncStr
(
pGid
->
syncState
),
pGid
->
syncRestore
,
pGid
->
syncCanRead
,
syncStr
(
pVload
->
syncState
),
pVload
->
syncRestore
,
pVload
->
syncCanRead
,
pDnode
->
id
);
pGid
->
syncState
=
pVload
->
syncState
;
pGid
->
syncTerm
=
pVload
->
syncTerm
;
pGid
->
syncRestore
=
pVload
->
syncRestore
;
pGid
->
syncCanRead
=
pVload
->
syncCanRead
;
roleChanged
=
true
;
pGid
->
startTimeMs
=
(
pVload
->
startTimeMs
!=
0
)
?
pVload
->
startTimeMs
:
statusReq
.
rebootTime
;
}
if
(
roleChanged
)
{
pGid
->
roleTimeMs
=
(
pVload
->
roleTimeMs
!=
0
)
?
pVload
->
roleTimeMs
:
taosGetTimestampMs
();
}
break
;
}
...
...
@@ -533,17 +538,15 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
if
(
pObj
!=
NULL
)
{
bool
roleChanged
=
pObj
->
syncState
!=
statusReq
.
mload
.
syncState
||
(
statusReq
.
mload
.
syncTerm
!=
-
1
&&
pObj
->
syncTerm
!=
statusReq
.
mload
.
syncTerm
);
bool
restoreChanged
=
pObj
->
syncRestore
!=
statusReq
.
mload
.
syncRestore
;
if
(
roleChanged
||
restoreChanged
)
{
if
(
roleChanged
||
pObj
->
syncRestore
!=
statusReq
.
mload
.
syncRestore
)
{
mInfo
(
"dnode:%d, mnode syncState from %s to %s, restoreState from %d to %d, syncTerm from %"
PRId64
" to %"
PRId64
,
pObj
->
id
,
syncStr
(
pObj
->
syncState
),
syncStr
(
statusReq
.
mload
.
syncState
),
pObj
->
syncRestore
,
statusReq
.
mload
.
syncRestore
,
pObj
->
syncTerm
,
statusReq
.
mload
.
syncTerm
);
pObj
->
syncState
=
statusReq
.
mload
.
syncState
;
pObj
->
syncRestore
=
statusReq
.
mload
.
syncRestore
;
pObj
->
syncTerm
=
statusReq
.
mload
.
syncTerm
;
pObj
->
syncRestore
=
statusReq
.
mload
.
syncRestore
;
}
if
(
roleChanged
)
{
pObj
->
roleTimeMs
=
(
statusReq
.
mload
.
roleTimeMs
!=
0
)
?
statusReq
.
mload
.
roleTimeMs
:
taosGetTimestampMs
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录