Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
5a601c83
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5a601c83
编写于
5月 28, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-335] optimize mnode queue
上级
d1003fed
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
40 addition
and
22 deletion
+40
-22
src/dnode/src/dnodeMPeer.c
src/dnode/src/dnodeMPeer.c
+1
-1
src/dnode/src/dnodeMRead.c
src/dnode/src/dnodeMRead.c
+1
-1
src/dnode/src/dnodeMWrite.c
src/dnode/src/dnodeMWrite.c
+1
-1
src/inc/dnode.h
src/inc/dnode.h
+7
-1
src/mnode/src/mnodeDnode.c
src/mnode/src/mnodeDnode.c
+1
-1
src/mnode/src/mnodeMain.c
src/mnode/src/mnodeMain.c
+8
-1
src/mnode/src/mnodePeer.c
src/mnode/src/mnodePeer.c
+3
-3
src/mnode/src/mnodeRead.c
src/mnode/src/mnodeRead.c
+7
-6
src/mnode/src/mnodeShow.c
src/mnode/src/mnodeShow.c
+3
-0
src/mnode/src/mnodeWrite.c
src/mnode/src/mnodeWrite.c
+8
-7
未找到文件。
src/dnode/src/dnodeMPeer.c
浏览文件 @
5a601c83
...
...
@@ -145,7 +145,7 @@ static void *dnodeProcessMnodePeerQueue(void *param) {
break
;
}
dTrace
(
"%p, msg:%s will be processed"
,
pPeerMsg
->
ahandle
,
taosMsg
[
pPeerMsg
->
msgType
]);
dTrace
(
"%p, msg:%s will be processed
in mpeer queue
"
,
pPeerMsg
->
ahandle
,
taosMsg
[
pPeerMsg
->
msgType
]);
int32_t
code
=
mnodeProcessPeerReq
(
pPeerMsg
);
dnodeSendRpcMnodePeerRsp
(
pPeerMsg
,
code
);
taosFreeQitem
(
pPeerMsg
);
...
...
src/dnode/src/dnodeMRead.c
浏览文件 @
5a601c83
...
...
@@ -150,7 +150,7 @@ static void *dnodeProcessMnodeReadQueue(void *param) {
break
;
}
dTrace
(
"%p, msg:%s will be processed"
,
pReadMsg
->
ahandle
,
taosMsg
[
pReadMsg
->
msgType
]);
dTrace
(
"%p, msg:%s will be processed
in mread queue
"
,
pReadMsg
->
ahandle
,
taosMsg
[
pReadMsg
->
msgType
]);
int32_t
code
=
mnodeProcessRead
(
pReadMsg
);
dnodeSendRpcMnodeReadRsp
(
pReadMsg
,
code
);
taosFreeQitem
(
pReadMsg
);
...
...
src/dnode/src/dnodeMWrite.c
浏览文件 @
5a601c83
...
...
@@ -148,7 +148,7 @@ static void *dnodeProcessMnodeWriteQueue(void *param) {
break
;
}
dTrace
(
"%p, msg:%s will be processed"
,
pWriteMsg
->
ahandle
,
taosMsg
[
pWriteMsg
->
msgType
]);
dTrace
(
"%p, msg:%s will be processed
in mwrite queue
"
,
pWriteMsg
->
ahandle
,
taosMsg
[
pWriteMsg
->
msgType
]);
int32_t
code
=
mnodeProcessWrite
(
pWriteMsg
);
dnodeSendRpcMnodeWriteRsp
(
pWriteMsg
,
code
);
taosFreeQitem
(
pWriteMsg
);
...
...
src/inc/dnode.h
浏览文件 @
5a601c83
...
...
@@ -51,10 +51,16 @@ void * dnodeGetMnodeInfos();
int32_t
dnodeGetDnodeId
();
void
dnodeAddClientRspHandle
(
uint8_t
msgType
,
void
(
*
fp
)(
SRpcMsg
*
rpcMsg
));
void
dnodeAddServerMsgHandle
(
uint8_t
msgType
,
void
(
*
fp
)(
SRpcMsg
*
rpcMsg
));
void
dnodeSendMsgToDnode
(
SRpcIpSet
*
ipSet
,
SRpcMsg
*
rpcMsg
);
void
dnodeSendMsgToDnodeRecv
(
SRpcMsg
*
rpcMsg
,
SRpcMsg
*
rpcRsp
);
int32_t
dnodeAllocateMnodeWqueue
();
void
dnodeFreeMnodeWqueue
();
int32_t
dnodeAllocateMnodeRqueue
();
void
dnodeFreeMnodeRqueue
();
int32_t
dnodeAllocateMnodePqueue
();
void
dnodeFreeMnodePqueue
();
void
dnodeSendRpcMnodeWriteRsp
(
void
*
pMsg
,
int32_t
code
);
void
dnodeReprocessMnodeWriteMsg
(
void
*
pMsg
);
void
dnodeDelayReprocessMnodeWriteMsg
(
void
*
pMsg
);
...
...
src/mnode/src/mnodeDnode.c
浏览文件 @
5a601c83
...
...
@@ -314,7 +314,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
if
(
pStatus
->
dnodeId
==
0
)
{
mTrace
(
"dnode:%d %s, first access"
,
pDnode
->
dnodeId
,
pDnode
->
dnodeEp
);
}
else
{
//
mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess);
mTrace
(
"dnode:%d, status received, access times %d"
,
pDnode
->
dnodeId
,
pDnode
->
lastAccess
);
}
int32_t
openVnodes
=
htons
(
pStatus
->
openVnodes
);
...
...
src/mnode/src/mnodeMain.c
浏览文件 @
5a601c83
...
...
@@ -53,6 +53,10 @@ int32_t mnodeStartSystem() {
mkdir
(
tsMnodeDir
,
0755
);
}
dnodeAllocateMnodeWqueue
();
dnodeAllocateMnodeRqueue
();
dnodeAllocateMnodePqueue
();
if
(
mnodeInitAccts
()
<
0
)
{
mError
(
"failed to init accts"
);
return
-
1
;
...
...
@@ -125,6 +129,9 @@ void mnodeCleanupSystem() {
mPrint
(
"starting to clean up mgmt"
);
tsMgmtIsRunning
=
false
;
dnodeFreeMnodeWqueue
();
dnodeFreeMnodeRqueue
();
dnodeFreeMnodePqueue
();
mnodeCleanupTimer
();
mnodeCleanUpShow
();
grantCleanUp
();
...
...
@@ -152,7 +159,7 @@ void mgmtStopSystem() {
}
static
void
mnodeInitTimer
()
{
if
(
tsMnodeTmr
!
=
NULL
)
{
if
(
tsMnodeTmr
=
=
NULL
)
{
tsMnodeTmr
=
taosTmrInit
((
tsMaxShellConns
)
*
3
,
200
,
3600000
,
"MND"
);
}
}
...
...
src/mnode/src/mnodePeer.c
浏览文件 @
5a601c83
...
...
@@ -48,7 +48,7 @@ void mnodeAddPeerRspHandle(uint8_t msgType, void (*fp)(SRpcMsg *rpcMsg)) {
int32_t
mnodeProcessPeerReq
(
SMnodeMsg
*
pMsg
)
{
if
(
pMsg
->
pCont
==
NULL
)
{
mError
(
"
msg:%s content is null"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mpeer queue, content is null"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_INVALID_MSG_LEN
;
}
...
...
@@ -59,7 +59,7 @@ int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg) {
rpcRsp
->
rsp
=
ipSet
;
rpcRsp
->
len
=
sizeof
(
SRpcIpSet
);
mTrace
(
"
msg:%s will be redireced, inUse:%d"
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
mTrace
(
"
%p, msg:%s in mpeer queue, will be redireced inUse:%d"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
for
(
int32_t
i
=
0
;
i
<
ipSet
->
numOfIps
;
++
i
)
{
mTrace
(
"mnode index:%d ip:%s:%d"
,
i
,
ipSet
->
fqdn
[
i
],
htons
(
ipSet
->
port
[
i
]));
}
...
...
@@ -68,7 +68,7 @@ int32_t mnodeProcessPeerReq(SMnodeMsg *pMsg) {
}
if
(
tsMnodeProcessPeerMsgFp
[
pMsg
->
msgType
]
==
NULL
)
{
mError
(
"
msg:%s not processed, no handle exist"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mpeer queue, not processed"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_MSG_NOT_PROCESSED
;
}
...
...
src/mnode/src/mnodeRead.c
浏览文件 @
5a601c83
...
...
@@ -43,7 +43,7 @@ void mnodeAddReadMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *pMsg)) {
int32_t
mnodeProcessRead
(
SMnodeMsg
*
pMsg
)
{
if
(
pMsg
->
pCont
==
NULL
)
{
mError
(
"
msg:%s content is null"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mread queue, content is null"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_INVALID_MSG_LEN
;
}
...
...
@@ -54,7 +54,7 @@ int32_t mnodeProcessRead(SMnodeMsg *pMsg) {
rpcRsp
->
rsp
=
ipSet
;
rpcRsp
->
len
=
sizeof
(
SRpcIpSet
);
mTrace
(
"
msg:%s will be redireced, inUse:%d"
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
mTrace
(
"
%p, msg:%s in mread queue, will be redireced, inUse:%d"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
for
(
int32_t
i
=
0
;
i
<
ipSet
->
numOfIps
;
++
i
)
{
mTrace
(
"mnode index:%d ip:%s:%d"
,
i
,
ipSet
->
fqdn
[
i
],
htons
(
ipSet
->
port
[
i
]));
}
...
...
@@ -63,13 +63,14 @@ int32_t mnodeProcessRead(SMnodeMsg *pMsg) {
}
if
(
tsMnodeProcessReadMsgFp
[
pMsg
->
msgType
]
==
NULL
)
{
mError
(
"
msg:%s not processed, no handle exist"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mread queue, not processed"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_MSG_NOT_PROCESSED
;
}
if
(
!
mnodeInitMsg
(
pMsg
))
{
mError
(
"msg:%s not processed, reason:%s"
,
taosMsg
[
pMsg
->
msgType
],
tstrerror
(
terrno
));
return
terrno
;
int32_t
code
=
mnodeInitMsg
(
pMsg
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
mError
(
"%p, msg:%s in mread queue, not processed reason:%s"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
],
tstrerror
(
code
));
return
code
;
}
return
(
*
tsMnodeProcessReadMsgFp
[
pMsg
->
msgType
])(
pMsg
);
...
...
src/mnode/src/mnodeShow.c
浏览文件 @
5a601c83
...
...
@@ -131,6 +131,9 @@ static int32_t mnodeProcessShowMsg(SMnodeMsg *pMsg) {
memcpy
(
pShow
->
payload
,
pShowMsg
->
payload
,
pShow
->
payloadLen
);
pShow
=
mnodeSaveQhandle
(
pShow
,
showObjSize
);
if
(
pShow
==
NULL
)
{
return
TSDB_CODE_SERV_OUT_OF_MEMORY
;
}
pShowRsp
->
qhandle
=
htobe64
((
uint64_t
)
pShow
);
mTrace
(
"show:%p, type:%s, start to get meta"
,
pShow
,
mnodeGetShowType
(
pShowMsg
->
type
));
...
...
src/mnode/src/mnodeWrite.c
浏览文件 @
5a601c83
...
...
@@ -42,7 +42,7 @@ void mnodeAddWriteMsgHandle(uint8_t msgType, int32_t (*fp)(SMnodeMsg *mnodeMsg))
int32_t
mnodeProcessWrite
(
SMnodeMsg
*
pMsg
)
{
if
(
pMsg
->
pCont
==
NULL
)
{
mError
(
"
msg:%s content is null"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mwrite queue, content is null"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_INVALID_MSG_LEN
;
}
...
...
@@ -53,7 +53,7 @@ int32_t mnodeProcessWrite(SMnodeMsg *pMsg) {
rpcRsp
->
rsp
=
ipSet
;
rpcRsp
->
len
=
sizeof
(
SRpcIpSet
);
mTrace
(
"
msg:%s will be redireced, inUse:%d"
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
mTrace
(
"
%p, msg:%s in mwrite queue, will be redireced inUse:%d"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
],
ipSet
->
inUse
);
for
(
int32_t
i
=
0
;
i
<
ipSet
->
numOfIps
;
++
i
)
{
mTrace
(
"mnode index:%d ip:%s:%d"
,
i
,
ipSet
->
fqdn
[
i
],
htons
(
ipSet
->
port
[
i
]));
}
...
...
@@ -62,17 +62,18 @@ int32_t mnodeProcessWrite(SMnodeMsg *pMsg) {
}
if
(
tsMnodeProcessWriteMsgFp
[
pMsg
->
msgType
]
==
NULL
)
{
mError
(
"
msg:%s not processed, no handle exist"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"
%p, msg:%s in mwrite queue, not processed"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_MSG_NOT_PROCESSED
;
}
if
(
!
mnodeInitMsg
(
pMsg
))
{
mError
(
"msg:%s not processed, reason:%s"
,
taosMsg
[
pMsg
->
msgType
],
tstrerror
(
terrno
));
return
terrno
;
int32_t
code
=
mnodeInitMsg
(
pMsg
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
mError
(
"%p, msg:%s in mwrite queue, not processed reason:%s"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
],
tstrerror
(
code
));
return
code
;
}
if
(
!
pMsg
->
pUser
->
writeAuth
)
{
mError
(
"%p, msg:%s
not processed, no rights"
,
taosMsg
[
pMsg
->
msgType
]);
mError
(
"%p, msg:%s
in mwrite queue, not processed, no write auth"
,
pMsg
->
ahandle
,
taosMsg
[
pMsg
->
msgType
]);
return
TSDB_CODE_NO_RIGHTS
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录