Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
5e53b122
T
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5e53b122
编写于
3月 09, 2023
作者:
B
Benguang Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: finish restore with commit and applied indexes instead of num of items in apply queue
上级
552d0bc8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
11 deletion
+17
-11
include/libs/sync/sync.h
include/libs/sync/sync.h
+1
-1
source/dnode/mnode/impl/src/mndSync.c
source/dnode/mnode/impl/src/mndSync.c
+1
-1
source/dnode/vnode/src/vnd/vnodeSync.c
source/dnode/vnode/src/vnd/vnodeSync.c
+12
-6
source/libs/sync/src/syncPipeline.c
source/libs/sync/src/syncPipeline.c
+3
-3
未找到文件。
include/libs/sync/sync.h
浏览文件 @
5e53b122
...
...
@@ -147,7 +147,7 @@ typedef struct SSyncFSM {
int32_t
(
*
FpPreCommitCb
)(
const
struct
SSyncFSM
*
pFsm
,
SRpcMsg
*
pMsg
,
const
SFsmCbMeta
*
pMeta
);
void
(
*
FpRollBackCb
)(
const
struct
SSyncFSM
*
pFsm
,
SRpcMsg
*
pMsg
,
const
SFsmCbMeta
*
pMeta
);
void
(
*
FpRestoreFinishCb
)(
const
struct
SSyncFSM
*
pFsm
);
void
(
*
FpRestoreFinishCb
)(
const
struct
SSyncFSM
*
pFsm
,
const
SyncIndex
commitIdx
);
void
(
*
FpReConfigCb
)(
const
struct
SSyncFSM
*
pFsm
,
SRpcMsg
*
pMsg
,
const
SReConfigCbMeta
*
pMeta
);
void
(
*
FpLeaderTransferCb
)(
const
struct
SSyncFSM
*
pFsm
,
SRpcMsg
*
pMsg
,
const
SFsmCbMeta
*
pMeta
);
bool
(
*
FpApplyQueueEmptyCb
)(
const
struct
SSyncFSM
*
pFsm
);
...
...
source/dnode/mnode/impl/src/mndSync.c
浏览文件 @
5e53b122
...
...
@@ -162,7 +162,7 @@ static void mndSyncGetSnapshotInfo(const SSyncFSM *pFsm, SSnapshot *pSnapshot) {
sdbGetCommitInfo
(
pMnode
->
pSdb
,
&
pSnapshot
->
lastApplyIndex
,
&
pSnapshot
->
lastApplyTerm
,
&
pSnapshot
->
lastConfigIndex
);
}
void
mndRestoreFinish
(
const
SSyncFSM
*
pFsm
)
{
void
mndRestoreFinish
(
const
SSyncFSM
*
pFsm
,
const
SyncIndex
commitIdx
)
{
SMnode
*
pMnode
=
pFsm
->
data
;
if
(
!
pMnode
->
deploy
)
{
...
...
source/dnode/vnode/src/vnd/vnodeSync.c
浏览文件 @
5e53b122
...
...
@@ -521,21 +521,27 @@ static int32_t vnodeSnapshotDoWrite(const SSyncFSM *pFsm, void *pWriter, void *p
return
code
;
}
static
void
vnodeRestoreFinish
(
const
SSyncFSM
*
pFsm
)
{
static
void
vnodeRestoreFinish
(
const
SSyncFSM
*
pFsm
,
const
SyncIndex
commitIdx
)
{
SVnode
*
pVnode
=
pFsm
->
data
;
SyncIndex
appliedIdx
=
-
1
;
do
{
int32_t
itemSize
=
tmsgGetQueueSize
(
&
pVnode
->
msgCb
,
pVnode
->
config
.
vgId
,
APPLY_QUEUE
);
if
(
itemSize
==
0
)
{
vInfo
(
"vgId:%d, apply queue is empty, restore finish"
,
pVnode
->
config
.
vgId
);
appliedIdx
=
vnodeSyncAppliedIndex
(
pFsm
);
ASSERT
(
appliedIdx
<=
commitIdx
);
if
(
appliedIdx
==
commitIdx
)
{
vInfo
(
"vgId:%d, no more items to be applied, restore finish"
,
pVnode
->
config
.
vgId
);
break
;
}
else
{
vInfo
(
"vgId:%d, restore not finish since %d items in apply queue"
,
pVnode
->
config
.
vgId
,
itemSize
);
int32_t
itemSize
=
tmsgGetQueueSize
(
&
pVnode
->
msgCb
,
pVnode
->
config
.
vgId
,
APPLY_QUEUE
);
vInfo
(
"vgId:%d, restore not finish since %"
PRId64
" items to be applied, and %d in apply queue. commit-index:%"
PRId64
", applied-index:%"
PRId64
,
pVnode
->
config
.
vgId
,
commitIdx
-
appliedIdx
,
itemSize
,
commitIdx
,
appliedIdx
);
taosMsleep
(
10
);
}
}
while
(
true
);
walApplyVer
(
pVnode
->
pWal
,
pVnode
->
state
.
applied
);
ASSERT
(
appliedIdx
==
commitIdx
);
walApplyVer
(
pVnode
->
pWal
,
commitIdx
);
pVnode
->
restored
=
true
;
vInfo
(
"vgId:%d, sync restore finished"
,
pVnode
->
config
.
vgId
);
...
...
source/libs/sync/src/syncPipeline.c
浏览文件 @
5e53b122
...
...
@@ -596,10 +596,10 @@ _out:
// mark as restored if needed
if
(
!
pNode
->
restoreFinish
&&
pBuf
->
commitIndex
>=
pNode
->
commitIndex
&&
pEntry
!=
NULL
&&
currentTerm
<=
pEntry
->
term
)
{
pNode
->
pFsm
->
FpRestoreFinishCb
(
pNode
->
pFsm
);
pNode
->
pFsm
->
FpRestoreFinishCb
(
pNode
->
pFsm
,
pBuf
->
commitIndex
);
pNode
->
restoreFinish
=
true
;
sInfo
(
"vgId:%d, restore finished.
log buffer: [%"
PRId64
" %"
PRId64
" %"
PRId64
", %"
PRId64
")"
,
pNode
->
vgId
,
pBuf
->
startIndex
,
pBuf
->
commitIndex
,
pBuf
->
matchIndex
,
pBuf
->
endIndex
);
sInfo
(
"vgId:%d, restore finished.
term:%"
PRId64
", log buffer: [%"
PRId64
" %"
PRId64
" %"
PRId64
", %"
PRId64
")"
,
p
Node
->
vgId
,
currentTerm
,
p
Buf
->
startIndex
,
pBuf
->
commitIndex
,
pBuf
->
matchIndex
,
pBuf
->
endIndex
);
}
if
(
!
inBuf
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录