Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
61cd7539
TDengine
项目概览
taosdata
/
TDengine
12 个月 前同步成功
通知
1180
Star
22014
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
61cd7539
编写于
12月 02, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: remove sync batch propose in vnode
上级
e8703cd4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
65 addition
and
9 deletion
+65
-9
source/dnode/vnode/src/vnd/vnodeSync.c
source/dnode/vnode/src/vnd/vnodeSync.c
+65
-9
未找到文件。
source/dnode/vnode/src/vnd/vnodeSync.c
浏览文件 @
61cd7539
...
...
@@ -16,7 +16,7 @@
#define _DEFAULT_SOURCE
#include "vnd.h"
#define BATCH_
DISABLE 1
#define BATCH_
ENABLE 0
static
inline
bool
vnodeIsMsgBlock
(
tmsg_t
type
)
{
return
(
type
==
TDMT_VND_CREATE_TABLE
)
||
(
type
==
TDMT_VND_ALTER_TABLE
)
||
(
type
==
TDMT_VND_DROP_TABLE
)
||
...
...
@@ -87,7 +87,7 @@ static void inline vnodeHandleWriteMsg(SVnode *pVnode, SRpcMsg *pMsg) {
}
static
void
vnodeHandleProposeError
(
SVnode
*
pVnode
,
SRpcMsg
*
pMsg
,
int32_t
code
)
{
if
(
code
==
TSDB_CODE_SYN_NOT_LEADER
)
{
if
(
code
==
TSDB_CODE_SYN_NOT_LEADER
||
code
==
TSDB_CODE_SYN_RESTORING
)
{
vnodeRedirectRpcMsg
(
pVnode
,
pMsg
);
}
else
{
const
STraceId
*
trace
=
&
pMsg
->
info
.
traceId
;
...
...
@@ -99,15 +99,12 @@ static void vnodeHandleProposeError(SVnode *pVnode, SRpcMsg *pMsg, int32_t code)
}
}
#if BATCH_ENABLE
static
void
inline
vnodeProposeBatchMsg
(
SVnode
*
pVnode
,
SRpcMsg
**
pMsgArr
,
bool
*
pIsWeakArr
,
int32_t
*
arrSize
)
{
if
(
*
arrSize
<=
0
)
return
;
#if BATCH_DISABLE
int32_t
code
=
syncPropose
(
pVnode
->
sync
,
pMsgArr
[
0
],
pIsWeakArr
[
0
]);
#else
int32_t
code
=
syncProposeBatch
(
pVnode
->
sync
,
pMsgArr
,
pIsWeakArr
,
*
arrSize
);
#endif
if
(
code
>
0
)
{
for
(
int32_t
i
=
0
;
i
<
*
arrSize
;
++
i
)
{
vnodeHandleWriteMsg
(
pVnode
,
pMsgArr
[
i
]);
...
...
@@ -177,7 +174,7 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
continue
;
}
if
(
isBlock
||
BATCH_DISABLE
)
{
if
(
isBlock
)
{
vnodeProposeBatchMsg
(
pVnode
,
pMsgArr
,
pIsWeakArr
,
&
arrayPos
);
}
...
...
@@ -185,7 +182,7 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
pIsWeakArr
[
arrayPos
]
=
isWeak
;
arrayPos
++
;
if
(
isBlock
||
msg
==
numOfMsgs
-
1
||
BATCH_DISABLE
)
{
if
(
isBlock
||
msg
==
numOfMsgs
-
1
)
{
vnodeProposeBatchMsg
(
pVnode
,
pMsgArr
,
pIsWeakArr
,
&
arrayPos
);
}
}
...
...
@@ -194,6 +191,65 @@ void vnodeProposeWriteMsg(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs)
taosMemoryFree
(
pIsWeakArr
);
}
#else
static
int32_t
inline
vnodeProposeMsg
(
SVnode
*
pVnode
,
SRpcMsg
*
pMsg
,
bool
isWeak
)
{
int32_t
code
=
syncPropose
(
pVnode
->
sync
,
pMsg
,
isWeak
);
if
(
code
>
0
)
{
vnodeHandleWriteMsg
(
pVnode
,
pMsg
);
}
else
if
(
code
==
0
)
{
vnodeWaitBlockMsg
(
pVnode
,
pMsg
);
}
else
{
if
(
terrno
!=
0
)
code
=
terrno
;
vnodeHandleProposeError
(
pVnode
,
pMsg
,
code
);
}
return
code
;
}
void
vnodeProposeWriteMsg
(
SQueueInfo
*
pInfo
,
STaosQall
*
qall
,
int32_t
numOfMsgs
)
{
SVnode
*
pVnode
=
pInfo
->
ahandle
;
int32_t
vgId
=
pVnode
->
config
.
vgId
;
int32_t
code
=
0
;
SRpcMsg
*
pMsg
=
NULL
;
vTrace
(
"vgId:%d, get %d msgs from vnode-write queue"
,
vgId
,
numOfMsgs
);
for
(
int32_t
msg
=
0
;
msg
<
numOfMsgs
;
msg
++
)
{
if
(
taosGetQitem
(
qall
,
(
void
**
)
&
pMsg
)
==
0
)
continue
;
bool
isWeak
=
vnodeIsMsgWeak
(
pMsg
->
msgType
);
const
STraceId
*
trace
=
&
pMsg
->
info
.
traceId
;
vGTrace
(
"vgId:%d, msg:%p get from vnode-write queue, weak:%d block:%d msg:%d:%d, handle:%p"
,
vgId
,
pMsg
,
isWeak
,
vnodeIsMsgBlock
(
pMsg
->
msgType
),
msg
,
numOfMsgs
,
pMsg
->
info
.
handle
);
if
(
!
pVnode
->
restored
)
{
vGError
(
"vgId:%d, msg:%p failed to process since restore not finished"
,
vgId
,
pMsg
);
vnodeHandleProposeError
(
pVnode
,
pMsg
,
TSDB_CODE_SYN_RESTORING
);
rpcFreeCont
(
pMsg
->
pCont
);
taosFreeQitem
(
pMsg
);
continue
;
}
code
=
vnodePreProcessWriteMsg
(
pVnode
,
pMsg
);
if
(
code
!=
0
)
{
vGError
(
"vgId:%d, msg:%p failed to pre-process since %s"
,
vgId
,
pMsg
,
terrstr
());
if
(
terrno
!=
0
)
code
=
terrno
;
vnodeHandleProposeError
(
pVnode
,
pMsg
,
code
);
rpcFreeCont
(
pMsg
->
pCont
);
taosFreeQitem
(
pMsg
);
continue
;
}
code
=
vnodeProposeMsg
(
pVnode
,
pMsg
,
isWeak
);
vGTrace
(
"vgId:%d, msg:%p is freed, code:0x%x"
,
vgId
,
pMsg
,
code
);
rpcFreeCont
(
pMsg
->
pCont
);
taosFreeQitem
(
pMsg
);
}
}
#endif
void
vnodeApplyWriteMsg
(
SQueueInfo
*
pInfo
,
STaosQall
*
qall
,
int32_t
numOfMsgs
)
{
SVnode
*
pVnode
=
pInfo
->
ahandle
;
int32_t
vgId
=
pVnode
->
config
.
vgId
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录