Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
b6fe5d91
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1193
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看板
提交
b6fe5d91
编写于
6月 17, 2023
作者:
Y
yihaoDeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor checkpoint
上级
89371927
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
7 deletion
+11
-7
include/libs/stream/tstream.h
include/libs/stream/tstream.h
+1
-0
source/dnode/mnode/impl/src/mndStream.c
source/dnode/mnode/impl/src/mndStream.c
+3
-7
source/libs/stream/src/streamMeta.c
source/libs/stream/src/streamMeta.c
+7
-0
未找到文件。
include/libs/stream/tstream.h
浏览文件 @
b6fe5d91
...
...
@@ -346,6 +346,7 @@ typedef struct SStreamMeta {
int32_t
walScanCounter
;
void
*
streamBackend
;
int64_t
streamBackendRid
;
int64_t
checkpointTs
;
}
SStreamMeta
;
int32_t
tEncodeStreamEpInfo
(
SEncoder
*
pEncoder
,
const
SStreamChildEpInfo
*
pInfo
);
...
...
source/dnode/mnode/impl/src/mndStream.c
浏览文件 @
b6fe5d91
...
...
@@ -944,8 +944,7 @@ static int32_t mndBuildStreamCheckpointSourceReq2(void **pBuf, int32_t *pLen, in
return
0
;
}
static
int32_t
mndProcessStreamCheckpointTrans
(
SMnode
*
pMnode
,
SStreamObj
*
pStream
,
SHashObj
*
vgIds
,
int64_t
checkpointId
)
{
static
int32_t
mndProcessStreamCheckpointTrans
(
SMnode
*
pMnode
,
SStreamObj
*
pStream
,
int64_t
checkpointId
)
{
int64_t
timestampMs
=
taosGetTimestampMs
();
if
(
timestampMs
-
pStream
->
checkpointFreq
<
tsStreamCheckpointTickInterval
*
1000
)
{
return
-
1
;
...
...
@@ -967,7 +966,7 @@ static int32_t mndProcessStreamCheckpointTrans(SMnode *pMnode, SStreamObj *pStre
for
(
int32_t
i
=
0
;
i
<
totLevel
;
i
++
)
{
SArray
*
pLevel
=
taosArrayGetP
(
pStream
->
tasks
,
i
);
SStreamTask
*
pTask
=
taosArrayGetP
(
pLevel
,
0
);
if
(
pTask
->
taskLevel
==
TASK_LEVEL__SOURCE
&&
NULL
==
taosHashGet
(
vgIds
,
&
pTask
->
nodeId
,
sizeof
(
pTask
->
nodeId
))
)
{
if
(
pTask
->
taskLevel
==
TASK_LEVEL__SOURCE
)
{
int32_t
sz
=
taosArrayGetSize
(
pLevel
);
for
(
int32_t
j
=
0
;
j
<
sz
;
j
++
)
{
SStreamTask
*
pTask
=
taosArrayGetP
(
pLevel
,
j
);
...
...
@@ -1003,7 +1002,6 @@ static int32_t mndProcessStreamCheckpointTrans(SMnode *pMnode, SStreamObj *pStre
mndTransDrop
(
pTrans
);
return
-
1
;
}
taosHashPut
(
vgIds
,
&
pTask
->
nodeId
,
sizeof
(
pTask
->
nodeId
),
&
pTask
->
nodeId
,
sizeof
(
pTask
->
nodeId
));
}
}
}
...
...
@@ -1054,17 +1052,15 @@ static int32_t mndProcessStreamDoCheckpoint(SRpcMsg *pReq) {
SMStreamDoCheckpointMsg
*
pMsg
=
(
SMStreamDoCheckpointMsg
*
)
pReq
->
pCont
;
int64_t
checkpointId
=
pMsg
->
checkpointId
;
SHashObj
*
vgIds
=
taosHashInit
(
64
,
taosGetDefaultHashFunction
(
TSDB_DATA_TYPE_INT
),
false
,
HASH_NO_LOCK
);
while
(
1
)
{
pIter
=
sdbFetch
(
pSdb
,
SDB_STREAM
,
pIter
,
(
void
**
)
&
pStream
);
if
(
pIter
==
NULL
)
break
;
code
=
mndProcessStreamCheckpointTrans
(
pMnode
,
pStream
,
vgIds
,
checkpointId
);
code
=
mndProcessStreamCheckpointTrans
(
pMnode
,
pStream
,
checkpointId
);
if
(
code
==
-
1
)
{
mInfo
(
"stream:%s failed to do checkpoint, reason: last checkpoint not finished"
,
pStream
->
name
);
}
sdbRelease
(
pSdb
,
pStream
);
}
taosHashCleanup
(
vgIds
);
return
0
;
}
...
...
source/libs/stream/src/streamMeta.c
浏览文件 @
b6fe5d91
...
...
@@ -407,6 +407,13 @@ int32_t streamDoCheckpoint(SStreamMeta* pMeta) {
int
code
=
-
1
;
char
buf
[
256
]
=
{
0
};
int64_t
ts
=
taosGetTimestampMs
();
if
(
ts
-
pMeta
->
checkpointTs
<=
tsStreamCheckpointTickInterval
*
1000
)
{
// avoid do checkpoint freq
return
0
;
}
pMeta
->
checkpointTs
=
ts
;
sprintf
(
buf
,
"%s/%s"
,
pMeta
->
path
,
"checkpoints"
);
code
=
taosMulModeMkDir
(
buf
,
0755
);
if
(
code
!=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录