Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2ae95217
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看板
提交
2ae95217
编写于
7月 19, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(stream): open inputQ by default for task deployed on snode.
上级
5b29a5ec
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
7 deletion
+8
-7
include/libs/stream/tstream.h
include/libs/stream/tstream.h
+1
-1
source/dnode/snode/src/snode.c
source/dnode/snode/src/snode.c
+2
-1
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+1
-1
source/libs/stream/src/streamRecover.c
source/libs/stream/src/streamRecover.c
+3
-3
tests/script/sh/deploy.sh
tests/script/sh/deploy.sh
+1
-1
未找到文件。
include/libs/stream/tstream.h
浏览文件 @
2ae95217
...
...
@@ -593,7 +593,7 @@ int32_t streamDispatchTransferStateMsg(SStreamTask* pTask);
// agg level
int32_t
streamAggScanHistoryPrepare
(
SStreamTask
*
pTask
);
int32_t
streamProcessScanHistoryFinishReq
(
SStreamTask
*
pTask
,
int32_t
taskId
,
int32_t
childId
);
int32_t
streamProcessScanHistoryFinishReq
(
SStreamTask
*
pTask
,
int32_t
childId
);
// stream task meta
void
streamMetaInit
();
...
...
source/dnode/snode/src/snode.c
浏览文件 @
2ae95217
...
...
@@ -90,6 +90,7 @@ int32_t sndExpandTask(SSnode *pSnode, SStreamTask *pTask, int64_t ver) {
pTask
->
exec
.
pExecutor
=
qCreateStreamExecTaskInfo
(
pTask
->
exec
.
qmsg
,
&
handle
,
0
);
ASSERT
(
pTask
->
exec
.
pExecutor
);
streamTaskOpenAllUpstreamInput
(
pTask
);
streamSetupScheduleTrigger
(
pTask
);
qDebug
(
"snode:%d expand stream task on snode, s-task:%s, checkpoint ver:%"
PRId64
" child id:%d, level:%d"
,
SNODE_HANDLE
,
...
...
@@ -292,7 +293,7 @@ int32_t sndProcessTaskRecoverFinishReq(SSnode *pSnode, SRpcMsg *pMsg) {
return
-
1
;
}
// do process request
if
(
streamProcessScanHistoryFinishReq
(
pTask
,
req
.
taskId
,
req
.
childId
)
<
0
)
{
if
(
streamProcessScanHistoryFinishReq
(
pTask
,
req
.
childId
)
<
0
)
{
streamMetaReleaseTask
(
pSnode
->
pMeta
,
pTask
);
return
-
1
;
}
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
2ae95217
...
...
@@ -1324,7 +1324,7 @@ int32_t tqProcessStreamTaskScanHistoryFinishReq(STQ* pTq, SRpcMsg* pMsg) {
return
-
1
;
}
int32_t
code
=
streamProcessScanHistoryFinishReq
(
pTask
,
req
.
taskId
,
req
.
childId
);
int32_t
code
=
streamProcessScanHistoryFinishReq
(
pTask
,
req
.
childId
);
streamMetaReleaseTask
(
pTq
->
pStreamMeta
,
pTask
);
return
code
;
}
...
...
source/libs/stream/src/streamRecover.c
浏览文件 @
2ae95217
...
...
@@ -378,7 +378,7 @@ int32_t streamAggUpstreamScanHistoryFinish(SStreamTask* pTask) {
return
0
;
}
int32_t
streamProcessScanHistoryFinishReq
(
SStreamTask
*
pTask
,
int32_t
taskId
,
int32_t
childId
)
{
int32_t
streamProcessScanHistoryFinishReq
(
SStreamTask
*
pTask
,
int32_t
childId
)
{
if
(
pTask
->
info
.
taskLevel
==
TASK_LEVEL__AGG
)
{
int32_t
left
=
atomic_sub_fetch_32
(
&
pTask
->
numOfWaitingUpstream
,
1
);
ASSERT
(
left
>=
0
);
...
...
@@ -390,8 +390,8 @@ int32_t streamProcessScanHistoryFinishReq(SStreamTask* pTask, int32_t taskId, in
streamAggUpstreamScanHistoryFinish
(
pTask
);
}
else
{
qDebug
(
"s-task:%s receive scan-history data finish msg from upstream
:0x%x
(index:%d), unfinished:%d"
,
pTask
->
id
.
idStr
,
taskId
,
childId
,
left
);
qDebug
(
"s-task:%s receive scan-history data finish msg from upstream
(index:%d), unfinished:%d"
,
pTask
->
id
.
idStr
,
childId
,
left
);
}
}
...
...
tests/script/sh/deploy.sh
浏览文件 @
2ae95217
...
...
@@ -118,7 +118,7 @@ echo "statusInterval 1" >> $TAOS_CFG
echo
"dataDir
$DATA_DIR
"
>>
$TAOS_CFG
echo
"logDir
$LOG_DIR
"
>>
$TAOS_CFG
echo
"debugFlag 0"
>>
$TAOS_CFG
echo
"tmrDebugFlag 1
43
"
>>
$TAOS_CFG
echo
"tmrDebugFlag 1
31
"
>>
$TAOS_CFG
echo
"uDebugFlag 143"
>>
$TAOS_CFG
echo
"rpcDebugFlag 143"
>>
$TAOS_CFG
echo
"jniDebugFlag 143"
>>
$TAOS_CFG
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录