Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
87785b1d
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
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看板
提交
87785b1d
编写于
8月 18, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: add some logs.
上级
a18989df
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
8 deletion
+15
-8
source/dnode/mnode/impl/src/mndStream.c
source/dnode/mnode/impl/src/mndStream.c
+5
-5
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+2
-0
source/libs/stream/src/streamExec.c
source/libs/stream/src/streamExec.c
+2
-2
source/libs/stream/src/streamTask.c
source/libs/stream/src/streamTask.c
+6
-1
未找到文件。
source/dnode/mnode/impl/src/mndStream.c
浏览文件 @
87785b1d
...
@@ -29,9 +29,10 @@
...
@@ -29,9 +29,10 @@
#include "tname.h"
#include "tname.h"
#include "tmisce.h"
#include "tmisce.h"
#define MND_STREAM_VER_NUMBER 3
#define MND_STREAM_VER_NUMBER 3
#define MND_STREAM_RESERVE_SIZE 64
#define MND_STREAM_RESERVE_SIZE 64
#define MND_STREAM_MAX_NUM 60
#define MND_STREAM_MAX_NUM 60
#define MND_STREAM_CHECKPOINT_NAME "stream-checkpoint"
typedef
struct
SNodeEntry
{
typedef
struct
SNodeEntry
{
int32_t
nodeId
;
int32_t
nodeId
;
...
@@ -52,7 +53,6 @@ typedef struct SVgroupChangeInfo {
...
@@ -52,7 +53,6 @@ typedef struct SVgroupChangeInfo {
static
int32_t
mndNodeCheckSentinel
=
0
;
static
int32_t
mndNodeCheckSentinel
=
0
;
static
SStreamVnodeRevertIndex
execNodeList
;
static
SStreamVnodeRevertIndex
execNodeList
;
#define MND_STREAM_CHECKPOINT_NAME "stream-checkpoint"
static
int32_t
mndStreamActionInsert
(
SSdb
*
pSdb
,
SStreamObj
*
pStream
);
static
int32_t
mndStreamActionInsert
(
SSdb
*
pSdb
,
SStreamObj
*
pStream
);
static
int32_t
mndStreamActionDelete
(
SSdb
*
pSdb
,
SStreamObj
*
pStream
);
static
int32_t
mndStreamActionDelete
(
SSdb
*
pSdb
,
SStreamObj
*
pStream
);
static
int32_t
mndStreamActionUpdate
(
SSdb
*
pSdb
,
SStreamObj
*
pOldStream
,
SStreamObj
*
pNewStream
);
static
int32_t
mndStreamActionUpdate
(
SSdb
*
pSdb
,
SStreamObj
*
pOldStream
,
SStreamObj
*
pNewStream
);
...
@@ -1827,7 +1827,7 @@ void initTransAction(STransAction* pAction, void* pCont, int32_t contLen, int32_
...
@@ -1827,7 +1827,7 @@ void initTransAction(STransAction* pAction, void* pCont, int32_t contLen, int32_
// todo extract method: traverse stream tasks
// todo extract method: traverse stream tasks
// build trans to update the epset
// build trans to update the epset
static
int32_t
createStreamUpdateTrans
(
SMnode
*
pMnode
,
SStreamObj
*
pStream
,
SVgroupChangeInfo
*
pInfo
)
{
static
int32_t
createStreamUpdateTrans
(
SMnode
*
pMnode
,
SStreamObj
*
pStream
,
SVgroupChangeInfo
*
pInfo
)
{
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_DB
_INSIDE
,
NULL
,
"stream-task-update"
);
STrans
*
pTrans
=
mndTransCreate
(
pMnode
,
TRN_POLICY_RETRY
,
TRN_CONFLICT_DB
,
NULL
,
"stream-task-update"
);
if
(
pTrans
==
NULL
)
{
if
(
pTrans
==
NULL
)
{
mError
(
"failed to build stream task DAG update, reason: %s"
,
tstrerror
(
TSDB_CODE_OUT_OF_MEMORY
));
mError
(
"failed to build stream task DAG update, reason: %s"
,
tstrerror
(
TSDB_CODE_OUT_OF_MEMORY
));
return
-
1
;
return
-
1
;
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
87785b1d
...
@@ -1902,6 +1902,8 @@ int32_t tqProcessTaskUpdateReq(STQ* pTq, SRpcMsg* pMsg) {
...
@@ -1902,6 +1902,8 @@ int32_t tqProcessTaskUpdateReq(STQ* pTq, SRpcMsg* pMsg) {
_end:
_end:
tDecoderClear
(
&
decoder
);
tDecoderClear
(
&
decoder
);
tmsgSendRsp
(
&
rsp
);
tmsgSendRsp
(
&
rsp
);
tqDebug
(
"s-task:%s task nodeEp update completed"
,
pTask
->
id
.
idStr
);
return
code
;
return
code
;
}
}
...
...
source/libs/stream/src/streamExec.c
浏览文件 @
87785b1d
...
@@ -89,7 +89,7 @@ static int32_t streamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pItem, i
...
@@ -89,7 +89,7 @@ static int32_t streamTaskExecImpl(SStreamTask* pTask, SStreamQueueItem* pItem, i
resetTaskInfo
(
pExecutor
);
resetTaskInfo
(
pExecutor
);
}
}
qError
(
"unexpected stream execution, s-task:%s since %s"
,
pTask
->
id
.
idStr
,
t
errstr
(
));
qError
(
"unexpected stream execution, s-task:%s since %s"
,
pTask
->
id
.
idStr
,
t
strerror
(
code
));
continue
;
continue
;
}
}
...
@@ -547,7 +547,7 @@ int32_t streamExecForAll(SStreamTask* pTask) {
...
@@ -547,7 +547,7 @@ int32_t streamExecForAll(SStreamTask* pTask) {
int32_t
numOfBlocks
=
0
;
int32_t
numOfBlocks
=
0
;
SStreamQueueItem
*
pInput
=
NULL
;
SStreamQueueItem
*
pInput
=
NULL
;
if
(
streamTaskShouldStop
(
&
pTask
->
status
))
{
if
(
streamTaskShouldStop
(
&
pTask
->
status
))
{
qDebug
(
"s-task:%s stream task
stopped, abort
"
,
id
);
qDebug
(
"s-task:%s stream task
is stopped
"
,
id
);
break
;
break
;
}
}
...
...
source/libs/stream/src/streamTask.c
浏览文件 @
87785b1d
...
@@ -254,7 +254,9 @@ static void freeUpstreamItem(void* p) {
...
@@ -254,7 +254,9 @@ static void freeUpstreamItem(void* p) {
}
}
void
tFreeStreamTask
(
SStreamTask
*
pTask
)
{
void
tFreeStreamTask
(
SStreamTask
*
pTask
)
{
qDebug
(
"free s-task:0x%x, %p"
,
pTask
->
id
.
taskId
,
pTask
);
int32_t
taskId
=
pTask
->
id
.
taskId
;
qDebug
(
"free s-task:0x%x, %p"
,
taskId
,
pTask
);
// remove the ref by timer
// remove the ref by timer
while
(
pTask
->
status
.
timerActive
>
0
)
{
while
(
pTask
->
status
.
timerActive
>
0
)
{
...
@@ -304,6 +306,7 @@ void tFreeStreamTask(SStreamTask* pTask) {
...
@@ -304,6 +306,7 @@ void tFreeStreamTask(SStreamTask* pTask) {
}
}
if
(
pTask
->
pState
)
{
if
(
pTask
->
pState
)
{
qDebug
(
"s-task:0x%x start to free task state"
,
taskId
);
streamStateClose
(
pTask
->
pState
,
status
==
TASK_STATUS__DROPPING
);
streamStateClose
(
pTask
->
pState
,
status
==
TASK_STATUS__DROPPING
);
}
}
...
@@ -330,6 +333,8 @@ void tFreeStreamTask(SStreamTask* pTask) {
...
@@ -330,6 +333,8 @@ void tFreeStreamTask(SStreamTask* pTask) {
taosThreadMutexDestroy
(
&
pTask
->
lock
);
taosThreadMutexDestroy
(
&
pTask
->
lock
);
taosMemoryFree
(
pTask
);
taosMemoryFree
(
pTask
);
qDebug
(
"s-task:0x%x free task completed"
,
taskId
);
}
}
int32_t
streamTaskInit
(
SStreamTask
*
pTask
,
SStreamMeta
*
pMeta
,
SMsgCb
*
pMsgCb
,
int64_t
ver
)
{
int32_t
streamTaskInit
(
SStreamTask
*
pTask
,
SStreamMeta
*
pMeta
,
SMsgCb
*
pMsgCb
,
int64_t
ver
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录