Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Rattenking
TDengine
提交
b39ceed0
T
TDengine
项目概览
Rattenking
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b39ceed0
编写于
12月 07, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TD-2324
上级
2db5f1e8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
31 deletion
+29
-31
src/vnode/inc/vnodeMain.h
src/vnode/inc/vnodeMain.h
+1
-0
src/vnode/inc/vnodeWorker.h
src/vnode/inc/vnodeWorker.h
+2
-2
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+7
-6
src/vnode/src/vnodeWorker.c
src/vnode/src/vnodeWorker.c
+19
-23
未找到文件。
src/vnode/inc/vnodeMain.h
浏览文件 @
b39ceed0
...
...
@@ -28,6 +28,7 @@ int32_t vnodeAlter(void *pVnode, SCreateVnodeMsg *pVnodeCfg);
int32_t
vnodeClose
(
int32_t
vgId
);
int32_t
vnodeReset
(
SVnodeObj
*
pVnode
);
void
vnodeCleanUp
(
SVnodeObj
*
pVnode
);
void
vnodeDestroy
(
SVnodeObj
*
pVnode
);
#ifdef __cplusplus
...
...
src/vnode/inc/vnodeWorker.h
浏览文件 @
b39ceed0
...
...
@@ -23,8 +23,8 @@ extern "C" {
int32_t
vnodeInitMWorker
();
void
vnodeCleanupMWorker
();
int32_t
vnode
OpenInMWorker
(
int32_t
vgId
,
void
*
rpcHandl
e
);
int32_t
vnode
CleanupInMWorker
(
int32_t
vgId
,
void
*
rpcHandl
e
);
int32_t
vnode
CleanupInMWorker
(
SVnodeObj
*
pVnod
e
);
int32_t
vnode
DestroyInMWorker
(
SVnodeObj
*
pVnod
e
);
#ifdef __cplusplus
}
...
...
src/vnode/src/vnodeMain.c
浏览文件 @
b39ceed0
...
...
@@ -26,8 +26,9 @@
#include "vnodeSync.h"
#include "vnodeVersion.h"
#include "vnodeMgmt.h"
#include "vnodeWorker.h"
#include "vnodeMain.h"
static
void
vnodeCleanUp
(
SVnodeObj
*
pVnode
);
static
int32_t
vnodeProcessTsdbStatus
(
void
*
arg
,
int32_t
status
,
int32_t
eno
);
int32_t
vnodeCreate
(
SCreateVnodeMsg
*
pVnodeCfg
)
{
...
...
@@ -110,6 +111,8 @@ int32_t vnodeDrop(int32_t vgId) {
vInfo
(
"vgId:%d, vnode will be dropped, refCount:%d pVnode:%p"
,
pVnode
->
vgId
,
pVnode
->
refCount
,
pVnode
);
pVnode
->
dropped
=
1
;
// remove from hash, so new messages wont be consumed
vnodeRemoveFromHash
(
pVnode
);
vnodeRelease
(
pVnode
);
vnodeCleanUp
(
pVnode
);
...
...
@@ -309,6 +312,7 @@ int32_t vnodeOpen(int32_t vgId) {
if
(
pVnode
->
sync
<=
0
)
{
vError
(
"vgId:%d, failed to open sync, replica:%d reason:%s"
,
pVnode
->
vgId
,
pVnode
->
syncCfg
.
replica
,
tstrerror
(
terrno
));
vnodeRemoveFromHash
(
pVnode
);
vnodeCleanUp
(
pVnode
);
return
terrno
;
}
...
...
@@ -322,6 +326,7 @@ int32_t vnodeClose(int32_t vgId) {
if
(
pVnode
==
NULL
)
return
0
;
vDebug
(
"vgId:%d, vnode will be closed, pVnode:%p"
,
pVnode
->
vgId
,
pVnode
);
vnodeRemoveFromHash
(
pVnode
);
vnodeRelease
(
pVnode
);
vnodeCleanUp
(
pVnode
);
...
...
@@ -398,11 +403,7 @@ void vnodeDestroy(SVnodeObj *pVnode) {
tsdbDecCommitRef
(
vgId
);
}
static
void
vnodeCleanUp
(
SVnodeObj
*
pVnode
)
{
// remove from hash, so new messages wont be consumed
vnodeRemoveFromHash
(
pVnode
);
void
vnodeCleanUp
(
SVnodeObj
*
pVnode
)
{
if
(
!
vnodeInInitStatus
(
pVnode
))
{
// it may be in updateing or reset state, then it shall wait
int32_t
i
=
0
;
...
...
src/vnode/src/vnodeWorker.c
浏览文件 @
b39ceed0
...
...
@@ -21,10 +21,11 @@
#include "tqueue.h"
#include "tglobal.h"
#include "vnodeWorker.h"
#include "vnodeMain.h"
typedef
enum
{
VNODE_WORKER_ACTION_C
REATE
,
VNODE_WORKER_ACTION_DE
LETE
VNODE_WORKER_ACTION_C
LEANUP
,
VNODE_WORKER_ACTION_DE
STROUY
}
EVMWorkerAction
;
typedef
struct
{
...
...
@@ -132,14 +133,11 @@ void vnodeCleanupMWorker() {
vnodeStopMWorker
();
}
static
int32_t
vnodeWriteIntoMWorker
(
int32_t
vgId
,
EVMWorkerAction
action
,
void
*
rpcHandle
)
{
static
int32_t
vnodeWriteIntoMWorker
(
SVnodeObj
*
pVnode
,
EVMWorkerAction
action
,
void
*
rpcHandle
)
{
SVMWorkerMsg
*
pMsg
=
taosAllocateQitem
(
sizeof
(
SVMWorkerMsg
));
if
(
pMsg
==
NULL
)
return
TSDB_CODE_VND_OUT_OF_MEMORY
;
SVnodeObj
*
pVnode
=
vnodeAcquire
(
vgId
);
if
(
pVnode
==
NULL
)
return
TSDB_CODE_VND_INVALID_VGROUP_ID
;
pMsg
->
vgId
=
vgId
;
pMsg
->
vgId
=
pVnode
->
vgId
;
pMsg
->
pVnode
=
pVnode
;
pMsg
->
rpcHandle
=
rpcHandle
;
pMsg
->
action
=
action
;
...
...
@@ -150,29 +148,27 @@ static int32_t vnodeWriteIntoMWorker(int32_t vgId, EVMWorkerAction action,void *
return
code
;
}
int32_t
vnode
OpenInMWorker
(
int32_t
vgId
,
void
*
rpcHandl
e
)
{
vTrace
(
"vgId:%d, will
open in vmworker"
,
vgId
);
return
vnodeWriteIntoMWorker
(
vgId
,
VNODE_WORKER_ACTION_CREATE
,
rpcHandle
);
int32_t
vnode
CleanupInMWorker
(
SVnodeObj
*
pVnod
e
)
{
vTrace
(
"vgId:%d, will
cleanup in vmworker"
,
pVnode
->
vgId
);
return
vnodeWriteIntoMWorker
(
pVnode
,
VNODE_WORKER_ACTION_CLEANUP
,
NULL
);
}
int32_t
vnode
CleanupInMWorker
(
int32_t
vgId
,
void
*
rpcHandl
e
)
{
vTrace
(
"vgId:%d, will
cleanup in vmworker"
,
vgId
);
return
vnodeWriteIntoMWorker
(
vgId
,
VNODE_WORKER_ACTION_DELETE
,
rpcHandle
);
int32_t
vnode
DestroyInMWorker
(
SVnodeObj
*
pVnod
e
)
{
vTrace
(
"vgId:%d, will
destroy in vmworker"
,
pVnode
->
vgId
);
return
vnodeWriteIntoMWorker
(
pVnode
,
VNODE_WORKER_ACTION_DESTROUY
,
NULL
);
}
static
void
vnodeFreeMWorkerMsg
(
SVMWorkerMsg
*
pMsg
)
{
vTrace
(
"vgId:%d, disposed in vmworker"
,
pMsg
->
vgId
);
vnodeRelease
(
pMsg
->
pVnode
);
taosFreeQitem
(
pMsg
);
}
static
void
vnodeSendVMWorkerRpcRsp
(
SVMWorkerMsg
*
pMsg
)
{
SRpcMsg
rpcRsp
=
{
.
handle
=
pMsg
->
rpcHandle
,
.
code
=
pMsg
->
code
,
}
;
if
(
pMsg
->
rpcHandle
!=
NULL
)
{
SRpcMsg
rpcRsp
=
{.
handle
=
pMsg
->
rpcHandle
,
.
code
=
pMsg
->
code
};
rpcSendResponse
(
&
rpcRsp
);
}
rpcSendResponse
(
&
rpcRsp
);
vnodeFreeMWorkerMsg
(
pMsg
);
}
...
...
@@ -180,11 +176,11 @@ static void vnodeProcessMWorkerMsg(SVMWorkerMsg *pMsg) {
pMsg
->
code
=
0
;
switch
(
pMsg
->
action
)
{
case
VNODE_WORKER_ACTION_C
REATE
:
pMsg
->
code
=
vnodeOpen
(
pMsg
->
vgId
);
case
VNODE_WORKER_ACTION_C
LEANUP
:
vnodeCleanUp
(
pMsg
->
pVnode
);
break
;
case
VNODE_WORKER_ACTION_DE
LETE
:
pMsg
->
code
=
vnodeDrop
(
pMsg
->
vgId
);
case
VNODE_WORKER_ACTION_DE
STROUY
:
vnodeDestroy
(
pMsg
->
pVnode
);
break
;
default:
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录