Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4c05a2ed
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看板
未验证
提交
4c05a2ed
编写于
3月 27, 2023
作者:
H
Hui Li
提交者:
GitHub
3月 27, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20609 from taosdata/fix/TS-2823-2.6
fix: check begin_thread return error
上级
477c83e2
adadbb96
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
4 deletion
+17
-4
src/dnode/src/dnodeVWrite.c
src/dnode/src/dnodeVWrite.c
+10
-2
src/util/src/tthread.c
src/util/src/tthread.c
+1
-0
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+6
-2
未找到文件。
src/dnode/src/dnodeVWrite.c
浏览文件 @
4c05a2ed
...
@@ -163,6 +163,7 @@ void dnodeFreeVWriteQueue(void *pWqueue) {
...
@@ -163,6 +163,7 @@ void dnodeFreeVWriteQueue(void *pWqueue) {
}
}
void
*
waitingResultThread
(
void
*
param
)
{
void
*
waitingResultThread
(
void
*
param
)
{
setThreadName
(
"waitDeleteResult"
);
SVWriteMsg
*
pWrite
=
(
SVWriteMsg
*
)
param
;
SVWriteMsg
*
pWrite
=
(
SVWriteMsg
*
)
param
;
// wait request deal finished
// wait request deal finished
dInfo
(
":SDEL pVnode:%p start wait commit pWrite=%p"
,
pWrite
->
pVnode
,
pWrite
);
dInfo
(
":SDEL pVnode:%p start wait commit pWrite=%p"
,
pWrite
->
pVnode
,
pWrite
);
...
@@ -216,8 +217,15 @@ void dnodeSendRpcVWriteRsp(void *pVnode, void *wparam, int32_t code) {
...
@@ -216,8 +217,15 @@ void dnodeSendRpcVWriteRsp(void *pVnode, void *wparam, int32_t code) {
// first add to list
// first add to list
vnodeAddWait
(
pVnode
,
NULL
,
pWrite
->
rspRet
.
psem
,
pWrite
);
vnodeAddWait
(
pVnode
,
NULL
,
pWrite
->
rspRet
.
psem
,
pWrite
);
pthread_t
*
thread
=
taosCreateThread
(
waitingResultThread
,
pWrite
);
pthread_t
*
thread
=
taosCreateThread
(
waitingResultThread
,
pWrite
);
// set thread
if
(
thread
==
NULL
)
{
vnodeSetWait
(
pVnode
,
thread
,
pWrite
);
dError
(
":SDEL pVnode:%p pWrite=%p create thread error."
,
pWrite
->
pVnode
,
pWrite
);
rpcSendResponse
(
&
rpcRsp
);
vnodeRemoveWait
(
pWrite
->
pVnode
,
pWrite
);
vnodeFreeFromWQueue
(
pVnode
,
pWrite
);
}
else
{
// set thread
vnodeSetWait
(
pVnode
,
thread
,
pWrite
);
}
}
}
}
}
}
}
...
...
src/util/src/tthread.c
浏览文件 @
4c05a2ed
...
@@ -31,6 +31,7 @@ pthread_t* taosCreateThread( void *(*__start_routine) (void *), void* param) {
...
@@ -31,6 +31,7 @@ pthread_t* taosCreateThread( void *(*__start_routine) (void *), void* param) {
pthread_attr_destroy
(
&
thattr
);
pthread_attr_destroy
(
&
thattr
);
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
uError
(
"failed to create thread code=%d since %s"
,
ret
,
strerror
(
ret
));
free
(
pthread
);
free
(
pthread
);
return
NULL
;
return
NULL
;
}
}
...
...
src/vnode/src/vnodeMain.c
浏览文件 @
4c05a2ed
...
@@ -686,6 +686,7 @@ void vnodeRemoveWait(void* vparam, void* param) {
...
@@ -686,6 +686,7 @@ void vnodeRemoveWait(void* vparam, void* param) {
SVnodeObj
*
pVnode
=
(
SVnodeObj
*
)
vparam
;
SVnodeObj
*
pVnode
=
(
SVnodeObj
*
)
vparam
;
SListIter
iter
=
{
0
};
SListIter
iter
=
{
0
};
vInfo
(
"vgId:%d :SDEL enter remove-wait pWrite=%p list count=%d "
,
pVnode
->
vgId
,
param
,
listNEles
(
pVnode
->
waitThreads
));
tsem_wait
(
&
pVnode
->
semWait
);
tsem_wait
(
&
pVnode
->
semWait
);
tdListInitIter
(
pVnode
->
waitThreads
,
&
iter
,
TD_LIST_FORWARD
);
tdListInitIter
(
pVnode
->
waitThreads
,
&
iter
,
TD_LIST_FORWARD
);
...
@@ -697,15 +698,18 @@ void vnodeRemoveWait(void* vparam, void* param) {
...
@@ -697,15 +698,18 @@ void vnodeRemoveWait(void* vparam, void* param) {
SWaitThread
*
pWaitThread
=
(
SWaitThread
*
)
pNode
->
data
;
SWaitThread
*
pWaitThread
=
(
SWaitThread
*
)
pNode
->
data
;
if
(
pWaitThread
->
param
==
param
)
{
if
(
pWaitThread
->
param
==
param
)
{
// found , free SWaitThread memeber
// found , free SWaitThread memeber
free
(
pWaitThread
->
pthread
);
if
(
pWaitThread
->
pthread
)
{
free
(
pWaitThread
->
pthread
);
}
tdListPopNode
(
pVnode
->
waitThreads
,
pNode
);
tdListPopNode
(
pVnode
->
waitThreads
,
pNode
);
v
Debug
(
"vgId:%d :SDEL removed wait thread %p wait
list count=%d "
,
pVnode
->
vgId
,
param
,
listNEles
(
pVnode
->
waitThreads
));
v
Info
(
"vgId:%d :SDEL deleted remove-wait pWrite=%p
list count=%d "
,
pVnode
->
vgId
,
param
,
listNEles
(
pVnode
->
waitThreads
));
// free pListNode self
// free pListNode self
free
(
pNode
);
free
(
pNode
);
break
;
break
;
}
}
}
}
tsem_post
(
&
pVnode
->
semWait
);
tsem_post
(
&
pVnode
->
semWait
);
vInfo
(
"vgId:%d :SDEL end remove-wait pWrite=%p list count=%d "
,
pVnode
->
vgId
,
param
,
listNEles
(
pVnode
->
waitThreads
));
}
}
// get wait thread count
// get wait thread count
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录