Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2e6263b4
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1187
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看板
提交
2e6263b4
编写于
8月 14, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(stream): fix memory leak.
上级
a1e554fb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
11 deletion
+16
-11
source/dnode/vnode/src/tq/tqRestore.c
source/dnode/vnode/src/tq/tqRestore.c
+3
-2
source/libs/stream/src/streamDispatch.c
source/libs/stream/src/streamDispatch.c
+2
-2
source/libs/stream/src/streamExec.c
source/libs/stream/src/streamExec.c
+11
-6
source/libs/stream/src/streamRecover.c
source/libs/stream/src/streamRecover.c
+0
-1
未找到文件。
source/dnode/vnode/src/tq/tqRestore.c
浏览文件 @
2e6263b4
...
...
@@ -211,12 +211,13 @@ int32_t doSetOffsetForWalReader(SStreamTask *pTask, int32_t vgId) {
static
void
checkForFillHistoryVerRange
(
SStreamTask
*
pTask
,
int64_t
ver
)
{
const
char
*
id
=
pTask
->
id
.
idStr
;
int64_t
maxVer
=
pTask
->
dataRange
.
range
.
maxVer
;
if
((
pTask
->
info
.
fillHistory
==
1
)
&&
ver
>
pTask
->
dataRange
.
range
.
maxVer
)
{
if
(
!
pTask
->
status
.
appendTranstateBlock
)
{
qWarn
(
"s-task:%s fill-history scan WAL, currentVer:%"
PRId64
" reach the maximum ver:%"
PRId64
", not scan wal anymore, add transfer-state block into inputQ"
,
id
,
ver
,
pTask
->
dataRange
.
range
.
maxVer
);
id
,
ver
,
maxVer
);
double
el
=
(
taosGetTimestampMs
()
-
pTask
->
tsInfo
.
step2Start
)
/
1000
.
0
;
qDebug
(
"s-task:%s scan-history from WAL stage(step 2) ended, elapsed time:%.2fs"
,
id
,
el
);
...
...
@@ -224,7 +225,7 @@ static void checkForFillHistoryVerRange(SStreamTask* pTask, int64_t ver) {
/*int32_t code = */
streamSchedExec
(
pTask
);
}
else
{
qWarn
(
"s-task:%s fill-history scan WAL, currentVer:%"
PRId64
" reach the maximum ver:%"
PRId64
", not scan wal"
,
id
,
ver
,
pTask
->
dataRange
.
range
.
maxVer
);
id
,
ver
,
maxVer
);
}
}
}
...
...
source/libs/stream/src/streamDispatch.c
浏览文件 @
2e6263b4
...
...
@@ -757,10 +757,10 @@ int32_t streamProcessDispatchRsp(SStreamTask* pTask, SStreamDispatchRsp* pRsp, i
qDebug
(
"s-task:%s dispatch transtate msg to downstream successfully, start to transfer state"
,
id
);
ASSERT
(
pTask
->
info
.
fillHistory
==
1
);
code
=
streamTransferStateToStreamTask
(
pTask
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
// todo: do nothing if error happens
// atomic_store_8(&pTask->status.schedStatus, TASK_SCHED_STATUS__INACTIVE);
}
streamFreeQitem
(
pTask
->
msgInfo
.
pData
);
return
TSDB_CODE_SUCCESS
;
}
...
...
source/libs/stream/src/streamExec.c
浏览文件 @
2e6263b4
...
...
@@ -534,16 +534,21 @@ int32_t streamProcessTranstateBlock(SStreamTask* pTask, SStreamDataBlock* pBlock
}
else
{
streamFreeQitem
((
SStreamQueueItem
*
)
pBlock
);
}
}
else
{
// level == TASK_LEVEL__SINK
streamFreeQitem
((
SStreamQueueItem
*
)
pBlock
);
}
}
else
{
// non-dispatch task, do task state transfer directly
qDebug
(
"s-task:%s non-dispatch task, start to transfer state directly"
,
id
);
streamFreeQitem
((
SStreamQueueItem
*
)
pBlock
);
ASSERT
(
pTask
->
info
.
fillHistory
==
1
);
code
=
streamTransferStateToStreamTask
(
pTask
);
if
(
level
!=
TASK_LEVEL__SINK
)
{
qDebug
(
"s-task:%s non-dispatch task, start to transfer state directly"
,
id
);
ASSERT
(
pTask
->
info
.
fillHistory
==
1
);
code
=
streamTransferStateToStreamTask
(
pTask
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
atomic_store_8
(
&
pTask
->
status
.
schedStatus
,
TASK_SCHED_STATUS__INACTIVE
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
atomic_store_8
(
&
pTask
->
status
.
schedStatus
,
TASK_SCHED_STATUS__INACTIVE
);
}
}
else
{
qDebug
(
"s-task:%d sink task does not transfer state"
,
id
);
}
}
...
...
source/libs/stream/src/streamRecover.c
浏览文件 @
2e6263b4
...
...
@@ -400,7 +400,6 @@ int32_t appendTranstateIntoInputQ(SStreamTask* pTask) {
}
pTask
->
status
.
appendTranstateBlock
=
true
;
qDebug
(
"s-task:%s set sched-status:%d, prev:%d"
,
pTask
->
id
.
idStr
,
TASK_SCHED_STATUS__INACTIVE
,
pTask
->
status
.
schedStatus
);
return
TSDB_CODE_SUCCESS
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录