Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
643a9dfa
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看板
提交
643a9dfa
编写于
5月 16, 2023
作者:
dengyihao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix crash when taosd quit
上级
0eb94d97
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
4 deletion
+13
-4
source/libs/stream/src/streamBackendRocksdb.c
source/libs/stream/src/streamBackendRocksdb.c
+9
-3
source/libs/stream/src/streamMeta.c
source/libs/stream/src/streamMeta.c
+4
-1
未找到文件。
source/libs/stream/src/streamBackendRocksdb.c
浏览文件 @
643a9dfa
...
@@ -109,7 +109,10 @@ void* streamBackendInit(const char* path) {
...
@@ -109,7 +109,10 @@ void* streamBackendInit(const char* path) {
if
(
err
!=
NULL
)
{
if
(
err
!=
NULL
)
{
qError
(
"failed to open rocksdb, path:%s, reason:%s"
,
path
,
err
);
qError
(
"failed to open rocksdb, path:%s, reason:%s"
,
path
,
err
);
taosMemoryFreeClear
(
err
);
taosMemoryFreeClear
(
err
);
rocksdb_list_column_families_destroy
(
cfs
,
nCf
);
goto
_EXIT
;
}
}
}
else
{
}
else
{
/*
/*
list all cf and get prefix
list all cf and get prefix
...
@@ -151,6 +154,11 @@ _EXIT:
...
@@ -151,6 +154,11 @@ _EXIT:
}
}
void
streamBackendCleanup
(
void
*
arg
)
{
void
streamBackendCleanup
(
void
*
arg
)
{
SBackendHandle
*
pHandle
=
(
SBackendHandle
*
)
arg
;
SBackendHandle
*
pHandle
=
(
SBackendHandle
*
)
arg
;
if
(
pHandle
==
NULL
||
pHandle
->
db
==
NULL
)
{
taosMemoryFree
(
pHandle
);
return
;
}
RocksdbCfInst
**
pIter
=
(
RocksdbCfInst
**
)
taosHashIterate
(
pHandle
->
cfInst
,
NULL
);
RocksdbCfInst
**
pIter
=
(
RocksdbCfInst
**
)
taosHashIterate
(
pHandle
->
cfInst
,
NULL
);
while
(
pIter
!=
NULL
)
{
while
(
pIter
!=
NULL
)
{
RocksdbCfInst
*
inst
=
*
pIter
;
RocksdbCfInst
*
inst
=
*
pIter
;
...
@@ -158,7 +166,6 @@ void streamBackendCleanup(void* arg) {
...
@@ -158,7 +166,6 @@ void streamBackendCleanup(void* arg) {
taosHashIterate
(
pHandle
->
cfInst
,
pIter
);
taosHashIterate
(
pHandle
->
cfInst
,
pIter
);
}
}
taosHashCleanup
(
pHandle
->
cfInst
);
taosHashCleanup
(
pHandle
->
cfInst
);
rocksdb_flushoptions_t
*
flushOpt
=
rocksdb_flushoptions_create
();
rocksdb_flushoptions_t
*
flushOpt
=
rocksdb_flushoptions_create
();
char
*
err
=
NULL
;
char
*
err
=
NULL
;
rocksdb_flush
(
pHandle
->
db
,
flushOpt
,
&
err
);
rocksdb_flush
(
pHandle
->
db
,
flushOpt
,
&
err
);
...
@@ -167,8 +174,8 @@ void streamBackendCleanup(void* arg) {
...
@@ -167,8 +174,8 @@ void streamBackendCleanup(void* arg) {
taosMemoryFree
(
err
);
taosMemoryFree
(
err
);
}
}
rocksdb_flushoptions_destroy
(
flushOpt
);
rocksdb_flushoptions_destroy
(
flushOpt
);
rocksdb_close
(
pHandle
->
db
);
rocksdb_close
(
pHandle
->
db
);
rocksdb_options_destroy
(
pHandle
->
dbOpt
);
rocksdb_options_destroy
(
pHandle
->
dbOpt
);
rocksdb_env_destroy
(
pHandle
->
env
);
rocksdb_env_destroy
(
pHandle
->
env
);
rocksdb_cache_destroy
(
pHandle
->
cache
);
rocksdb_cache_destroy
(
pHandle
->
cache
);
...
@@ -180,7 +187,6 @@ void streamBackendCleanup(void* arg) {
...
@@ -180,7 +187,6 @@ void streamBackendCleanup(void* arg) {
taosMemoryFree
(
head
);
taosMemoryFree
(
head
);
head
=
tdListPopHead
(
pHandle
->
list
);
head
=
tdListPopHead
(
pHandle
->
list
);
}
}
// rocksdb_compactionfilterfactory_destroy(pHandle->filterFactory);
tdListFree
(
pHandle
->
list
);
tdListFree
(
pHandle
->
list
);
taosThreadMutexDestroy
(
&
pHandle
->
cfMutex
);
taosThreadMutexDestroy
(
&
pHandle
->
cfMutex
);
...
...
source/libs/stream/src/streamMeta.c
浏览文件 @
643a9dfa
...
@@ -90,6 +90,10 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
...
@@ -90,6 +90,10 @@ SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandF
}
}
pMeta
->
streamBackend
=
streamBackendInit
(
streamPath
);
pMeta
->
streamBackend
=
streamBackendInit
(
streamPath
);
if
(
pMeta
->
streamBackend
==
NULL
)
{
terrno
=
-
1
;
goto
_err
;
}
pMeta
->
streamBackendRid
=
taosAddRef
(
streamBackendId
,
pMeta
->
streamBackend
);
pMeta
->
streamBackendRid
=
taosAddRef
(
streamBackendId
,
pMeta
->
streamBackend
);
taosMemoryFree
(
streamPath
);
taosMemoryFree
(
streamPath
);
...
@@ -105,7 +109,6 @@ _err:
...
@@ -105,7 +109,6 @@ _err:
if
(
pMeta
->
pTaskDb
)
tdbTbClose
(
pMeta
->
pTaskDb
);
if
(
pMeta
->
pTaskDb
)
tdbTbClose
(
pMeta
->
pTaskDb
);
if
(
pMeta
->
pCheckpointDb
)
tdbTbClose
(
pMeta
->
pCheckpointDb
);
if
(
pMeta
->
pCheckpointDb
)
tdbTbClose
(
pMeta
->
pCheckpointDb
);
if
(
pMeta
->
db
)
tdbClose
(
pMeta
->
db
);
if
(
pMeta
->
db
)
tdbClose
(
pMeta
->
db
);
// if (pMeta->streamBackend) streamBackendCleanup(pMeta->streamBackend);
taosMemoryFree
(
pMeta
);
taosMemoryFree
(
pMeta
);
qError
(
"failed to open stream meta"
);
qError
(
"failed to open stream meta"
);
return
NULL
;
return
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录