Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
3ea9fadf
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
3ea9fadf
编写于
12月 26, 2022
作者:
M
Minglei Jin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(vnd): save vnode info at the begining of vnode prepare commit
上级
028cc528
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
48 addition
and
19 deletion
+48
-19
source/dnode/vnode/src/vnd/vnodeCommit.c
source/dnode/vnode/src/vnd/vnodeCommit.c
+48
-19
未找到文件。
source/dnode/vnode/src/vnd/vnodeCommit.c
浏览文件 @
3ea9fadf
...
@@ -184,16 +184,51 @@ _err:
...
@@ -184,16 +184,51 @@ _err:
return
-
1
;
return
-
1
;
}
}
static
void
vnodePrepareCommit
(
SVnode
*
pVnode
)
{
static
int32_t
vnodePrepareCommit
(
SVnode
*
pVnode
,
SCommitInfo
*
pInfo
)
{
int32_t
code
=
0
;
int32_t
lino
=
0
;
char
dir
[
TSDB_FILENAME_LEN
]
=
{
0
};
tsem_wait
(
&
pVnode
->
canCommit
);
tsem_wait
(
&
pVnode
->
canCommit
);
pVnode
->
state
.
commitTerm
=
pVnode
->
state
.
applyTerm
;
pInfo
->
info
.
config
=
pVnode
->
config
;
pInfo
->
info
.
state
.
committed
=
pVnode
->
state
.
applied
;
pInfo
->
info
.
state
.
commitTerm
=
pVnode
->
state
.
applyTerm
;
pInfo
->
info
.
state
.
commitID
=
pVnode
->
state
.
commitID
;
pInfo
->
pVnode
=
pVnode
;
pInfo
->
txn
=
metaGetTxn
(
pVnode
->
pMeta
);
// save info
if
(
pVnode
->
pTfs
)
{
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s%s%s"
,
tfsGetPrimaryPath
(
pVnode
->
pTfs
),
TD_DIRSEP
,
pVnode
->
path
);
}
else
{
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s"
,
pVnode
->
path
);
}
if
(
vnodeSaveInfo
(
dir
,
&
pInfo
->
info
)
<
0
)
{
code
=
terrno
;
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
tsdbPrepareCommit
(
pVnode
->
pTsdb
);
tsdbPrepareCommit
(
pVnode
->
pTsdb
);
metaPrepareAsyncCommit
(
pVnode
->
pMeta
);
smaPrepareAsyncCommit
(
pVnode
->
pSma
);
smaPrepareAsyncCommit
(
pVnode
->
pSma
);
metaPrepareAsyncCommit
(
pVnode
->
pMeta
);
vnodeBufPoolUnRef
(
pVnode
->
inUse
);
vnodeBufPoolUnRef
(
pVnode
->
inUse
);
pVnode
->
inUse
=
NULL
;
pVnode
->
inUse
=
NULL
;
_exit:
if
(
code
)
{
vError
(
"vgId:%d, %s failed at line %d since %s, commit id:%"
PRId64
,
TD_VID
(
pVnode
),
__func__
,
lino
,
tstrerror
(
code
),
pVnode
->
state
.
commitID
);
}
else
{
vDebug
(
"vgId:%d, %s done"
,
TD_VID
(
pVnode
),
__func__
);
}
return
code
;
}
}
static
int32_t
vnodeCommitTask
(
void
*
arg
)
{
static
int32_t
vnodeCommitTask
(
void
*
arg
)
{
int32_t
code
=
0
;
int32_t
code
=
0
;
...
@@ -213,27 +248,26 @@ _exit:
...
@@ -213,27 +248,26 @@ _exit:
int
vnodeAsyncCommit
(
SVnode
*
pVnode
)
{
int
vnodeAsyncCommit
(
SVnode
*
pVnode
)
{
int32_t
code
=
0
;
int32_t
code
=
0
;
// prepare to commit
vnodePrepareCommit
(
pVnode
);
// schedule the task
pVnode
->
state
.
commitTerm
=
pVnode
->
state
.
applyTerm
;
SCommitInfo
*
pInfo
=
(
SCommitInfo
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pInfo
));
SCommitInfo
*
pInfo
=
(
SCommitInfo
*
)
taosMemoryCalloc
(
1
,
sizeof
(
*
pInfo
));
if
(
NULL
==
pInfo
)
{
if
(
NULL
==
pInfo
)
{
code
=
TSDB_CODE_OUT_OF_MEMORY
;
code
=
TSDB_CODE_OUT_OF_MEMORY
;
goto
_exit
;
goto
_exit
;
}
}
pInfo
->
info
.
config
=
pVnode
->
config
;
pInfo
->
info
.
state
.
committed
=
pVnode
->
state
.
applied
;
// prepare to commit
pInfo
->
info
.
state
.
commitTerm
=
pVnode
->
state
.
applyTerm
;
code
=
vnodePrepareCommit
(
pVnode
,
pInfo
);
pInfo
->
info
.
state
.
commitID
=
pVnode
->
state
.
commitID
;
if
(
TSDB_CODE_SUCCESS
!=
code
)
{
pInfo
->
pVnode
=
pVnode
;
goto
_exit
;
pInfo
->
txn
=
metaGetTxn
(
pVnode
->
pMeta
);
}
// schedule the task
vnodeScheduleTask
(
vnodeCommitTask
,
pInfo
);
vnodeScheduleTask
(
vnodeCommitTask
,
pInfo
);
_exit:
_exit:
if
(
code
)
{
if
(
code
)
{
if
(
NULL
!=
pInfo
)
{
taosMemoryFree
(
pInfo
);
}
vError
(
"vgId:%d, %s failed since %s, commit id:%"
PRId64
,
TD_VID
(
pVnode
),
__func__
,
tstrerror
(
code
),
vError
(
"vgId:%d, %s failed since %s, commit id:%"
PRId64
,
TD_VID
(
pVnode
),
__func__
,
tstrerror
(
code
),
pVnode
->
state
.
commitID
);
pVnode
->
state
.
commitID
);
}
else
{
}
else
{
...
@@ -265,16 +299,11 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
...
@@ -265,16 +299,11 @@ static int vnodeCommitImpl(SCommitInfo *pInfo) {
return
-
1
;
return
-
1
;
}
}
// save info
if
(
pVnode
->
pTfs
)
{
if
(
pVnode
->
pTfs
)
{
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s%s%s"
,
tfsGetPrimaryPath
(
pVnode
->
pTfs
),
TD_DIRSEP
,
pVnode
->
path
);
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s%s%s"
,
tfsGetPrimaryPath
(
pVnode
->
pTfs
),
TD_DIRSEP
,
pVnode
->
path
);
}
else
{
}
else
{
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s"
,
pVnode
->
path
);
snprintf
(
dir
,
TSDB_FILENAME_LEN
,
"%s"
,
pVnode
->
path
);
}
}
if
(
vnodeSaveInfo
(
dir
,
&
pInfo
->
info
)
<
0
)
{
code
=
terrno
;
TSDB_CHECK_CODE
(
code
,
lino
,
_exit
);
}
// walBeginSnapshot(pVnode->pWal, pVnode->state.applied);
// walBeginSnapshot(pVnode->pWal, pVnode->state.applied);
syncBeginSnapshot
(
pVnode
->
sync
,
pVnode
->
state
.
applied
);
syncBeginSnapshot
(
pVnode
->
sync
,
pVnode
->
state
.
applied
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录