Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
6f9153c6
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
6f9153c6
编写于
10月 17, 2022
作者:
L
Liu Jicong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: error handling
上级
1a113a5a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
3 deletion
+5
-3
source/client/src/clientTmq.c
source/client/src/clientTmq.c
+2
-2
source/dnode/mnode/impl/src/mndScheduler.c
source/dnode/mnode/impl/src/mndScheduler.c
+1
-1
source/libs/wal/src/walWrite.c
source/libs/wal/src/walWrite.c
+2
-0
未找到文件。
source/client/src/clientTmq.c
浏览文件 @
6f9153c6
...
@@ -966,14 +966,14 @@ int32_t tmq_subscribe(tmq_t* tmq, const tmq_list_t* topic_list) {
...
@@ -966,14 +966,14 @@ int32_t tmq_subscribe(tmq_t* tmq, const tmq_list_t* topic_list) {
SCMSubscribeReq
req
=
{
0
};
SCMSubscribeReq
req
=
{
0
};
int32_t
code
=
-
1
;
int32_t
code
=
-
1
;
tscDebug
(
"call tmq subscribe, consumer: %ld, topic num %d"
,
tmq
->
consumerId
,
sz
);
req
.
consumerId
=
tmq
->
consumerId
;
req
.
consumerId
=
tmq
->
consumerId
;
tstrncpy
(
req
.
clientId
,
tmq
->
clientId
,
256
);
tstrncpy
(
req
.
clientId
,
tmq
->
clientId
,
256
);
tstrncpy
(
req
.
cgroup
,
tmq
->
groupId
,
TSDB_CGROUP_LEN
);
tstrncpy
(
req
.
cgroup
,
tmq
->
groupId
,
TSDB_CGROUP_LEN
);
req
.
topicNames
=
taosArrayInit
(
sz
,
sizeof
(
void
*
));
req
.
topicNames
=
taosArrayInit
(
sz
,
sizeof
(
void
*
));
if
(
req
.
topicNames
==
NULL
)
goto
FAIL
;
if
(
req
.
topicNames
==
NULL
)
goto
FAIL
;
tscDebug
(
"call tmq subscribe, consumer: %ld, topic num %d"
,
tmq
->
consumerId
,
sz
);
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
char
*
topic
=
taosArrayGetP
(
container
,
i
);
char
*
topic
=
taosArrayGetP
(
container
,
i
);
...
...
source/dnode/mnode/impl/src/mndScheduler.c
浏览文件 @
6f9153c6
...
@@ -416,7 +416,7 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
...
@@ -416,7 +416,7 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
}
}
SStreamTask
*
pTask
=
tNewSStreamTask
(
pStream
->
uid
);
SStreamTask
*
pTask
=
tNewSStreamTask
(
pStream
->
uid
);
if
(
p
Inner
Task
==
NULL
)
{
if
(
pTask
==
NULL
)
{
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
sdbRelease
(
pSdb
,
pVgroup
);
sdbRelease
(
pSdb
,
pVgroup
);
qDestroyQueryPlan
(
pPlan
);
qDestroyQueryPlan
(
pPlan
);
...
...
source/libs/wal/src/walWrite.c
浏览文件 @
6f9153c6
...
@@ -45,6 +45,7 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
...
@@ -45,6 +45,7 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
if
(
taosRemoveFile
(
fnameStr
)
<
0
)
{
if
(
taosRemoveFile
(
fnameStr
)
<
0
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
wError
(
"vgId:%d restore from snapshot, cannot remove file %s since %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
,
terrstr
());
wError
(
"vgId:%d restore from snapshot, cannot remove file %s since %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
,
terrstr
());
taosThreadMutexUnlock
(
&
pWal
->
mutex
);
return
-
1
;
return
-
1
;
}
}
wInfo
(
"vgId:%d restore from snapshot, remove file %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
);
wInfo
(
"vgId:%d restore from snapshot, remove file %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
);
...
@@ -53,6 +54,7 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
...
@@ -53,6 +54,7 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
if
(
taosRemoveFile
(
fnameStr
)
<
0
)
{
if
(
taosRemoveFile
(
fnameStr
)
<
0
)
{
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
wError
(
"vgId:%d cannot remove file %s since %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
,
terrstr
());
wError
(
"vgId:%d cannot remove file %s since %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
,
terrstr
());
taosThreadMutexUnlock
(
&
pWal
->
mutex
);
return
-
1
;
return
-
1
;
}
}
wInfo
(
"vgId:%d restore from snapshot, remove file %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
);
wInfo
(
"vgId:%d restore from snapshot, remove file %s"
,
pWal
->
cfg
.
vgId
,
fnameStr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录