Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c93d93e2
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
c93d93e2
编写于
6月 23, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enh: add stbs/tbs/dbs to monitor info
上级
89fe5df6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
0 deletion
+15
-0
include/libs/monitor/monitor.h
include/libs/monitor/monitor.h
+3
-0
source/dnode/mnode/impl/src/mndMain.c
source/dnode/mnode/impl/src/mndMain.c
+3
-0
source/libs/monitor/src/monMain.c
source/libs/monitor/src/monMain.c
+3
-0
source/libs/monitor/src/monMsg.c
source/libs/monitor/src/monMsg.c
+6
-0
未找到文件。
include/libs/monitor/monitor.h
浏览文件 @
c93d93e2
...
@@ -109,6 +109,9 @@ typedef struct {
...
@@ -109,6 +109,9 @@ typedef struct {
char
version
[
MON_VER_LEN
];
char
version
[
MON_VER_LEN
];
float
master_uptime
;
// day
float
master_uptime
;
// day
int32_t
monitor_interval
;
// sec
int32_t
monitor_interval
;
// sec
int32_t
dbs_total
;
int32_t
stbs_total
;
int64_t
tbs_total
;
int32_t
vgroups_total
;
int32_t
vgroups_total
;
int32_t
vgroups_alive
;
int32_t
vgroups_alive
;
int32_t
vnodes_total
;
int32_t
vnodes_total
;
...
...
source/dnode/mnode/impl/src/mndMain.c
浏览文件 @
c93d93e2
...
@@ -632,6 +632,8 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
...
@@ -632,6 +632,8 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
tstrncpy
(
pClusterInfo
->
version
,
version
,
sizeof
(
pClusterInfo
->
version
));
tstrncpy
(
pClusterInfo
->
version
,
version
,
sizeof
(
pClusterInfo
->
version
));
pClusterInfo
->
monitor_interval
=
tsMonitorInterval
;
pClusterInfo
->
monitor_interval
=
tsMonitorInterval
;
pClusterInfo
->
connections_total
=
mndGetNumOfConnections
(
pMnode
);
pClusterInfo
->
connections_total
=
mndGetNumOfConnections
(
pMnode
);
pClusterInfo
->
dbs_total
=
sdbGetSize
(
pSdb
,
SDB_DB
);
pClusterInfo
->
stbs_total
=
sdbGetSize
(
pSdb
,
SDB_STB
);
void
*
pIter
=
NULL
;
void
*
pIter
=
NULL
;
while
(
1
)
{
while
(
1
)
{
...
@@ -681,6 +683,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
...
@@ -681,6 +683,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
if
(
pIter
==
NULL
)
break
;
if
(
pIter
==
NULL
)
break
;
pClusterInfo
->
vgroups_total
++
;
pClusterInfo
->
vgroups_total
++
;
pClusterInfo
->
tbs_total
+=
pVgroup
->
numOfTables
;
SMonVgroupDesc
desc
=
{
0
};
SMonVgroupDesc
desc
=
{
0
};
desc
.
vgroup_id
=
pVgroup
->
vgId
;
desc
.
vgroup_id
=
pVgroup
->
vgId
;
...
...
source/libs/monitor/src/monMain.c
浏览文件 @
c93d93e2
...
@@ -201,6 +201,9 @@ static void monGenClusterJson(SMonInfo *pMonitor) {
...
@@ -201,6 +201,9 @@ static void monGenClusterJson(SMonInfo *pMonitor) {
tjsonAddStringToObject
(
pJson
,
"version"
,
pInfo
->
version
);
tjsonAddStringToObject
(
pJson
,
"version"
,
pInfo
->
version
);
tjsonAddDoubleToObject
(
pJson
,
"master_uptime"
,
pInfo
->
master_uptime
);
tjsonAddDoubleToObject
(
pJson
,
"master_uptime"
,
pInfo
->
master_uptime
);
tjsonAddDoubleToObject
(
pJson
,
"monitor_interval"
,
pInfo
->
monitor_interval
);
tjsonAddDoubleToObject
(
pJson
,
"monitor_interval"
,
pInfo
->
monitor_interval
);
tjsonAddDoubleToObject
(
pJson
,
"dbs_total"
,
pInfo
->
dbs_total
);
tjsonAddDoubleToObject
(
pJson
,
"tbs_total"
,
pInfo
->
tbs_total
);
tjsonAddDoubleToObject
(
pJson
,
"stbs_total"
,
pInfo
->
stbs_total
);
tjsonAddDoubleToObject
(
pJson
,
"vgroups_total"
,
pInfo
->
vgroups_total
);
tjsonAddDoubleToObject
(
pJson
,
"vgroups_total"
,
pInfo
->
vgroups_total
);
tjsonAddDoubleToObject
(
pJson
,
"vgroups_alive"
,
pInfo
->
vgroups_alive
);
tjsonAddDoubleToObject
(
pJson
,
"vgroups_alive"
,
pInfo
->
vgroups_alive
);
tjsonAddDoubleToObject
(
pJson
,
"vnodes_total"
,
pInfo
->
vnodes_total
);
tjsonAddDoubleToObject
(
pJson
,
"vnodes_total"
,
pInfo
->
vnodes_total
);
...
...
source/libs/monitor/src/monMsg.c
浏览文件 @
c93d93e2
...
@@ -102,6 +102,9 @@ int32_t tEncodeSMonClusterInfo(SEncoder *encoder, const SMonClusterInfo *pInfo)
...
@@ -102,6 +102,9 @@ int32_t tEncodeSMonClusterInfo(SEncoder *encoder, const SMonClusterInfo *pInfo)
if
(
tEncodeCStr
(
encoder
,
pInfo
->
version
)
<
0
)
return
-
1
;
if
(
tEncodeCStr
(
encoder
,
pInfo
->
version
)
<
0
)
return
-
1
;
if
(
tEncodeFloat
(
encoder
,
pInfo
->
master_uptime
)
<
0
)
return
-
1
;
if
(
tEncodeFloat
(
encoder
,
pInfo
->
master_uptime
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
monitor_interval
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
monitor_interval
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
dbs_total
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
stbs_total
)
<
0
)
return
-
1
;
if
(
tEncodeI64
(
encoder
,
pInfo
->
tbs_total
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vgroups_total
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vgroups_total
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vgroups_alive
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vgroups_alive
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vnodes_total
)
<
0
)
return
-
1
;
if
(
tEncodeI32
(
encoder
,
pInfo
->
vnodes_total
)
<
0
)
return
-
1
;
...
@@ -130,6 +133,9 @@ int32_t tDecodeSMonClusterInfo(SDecoder *decoder, SMonClusterInfo *pInfo) {
...
@@ -130,6 +133,9 @@ int32_t tDecodeSMonClusterInfo(SDecoder *decoder, SMonClusterInfo *pInfo) {
if
(
tDecodeCStrTo
(
decoder
,
pInfo
->
version
)
<
0
)
return
-
1
;
if
(
tDecodeCStrTo
(
decoder
,
pInfo
->
version
)
<
0
)
return
-
1
;
if
(
tDecodeFloat
(
decoder
,
&
pInfo
->
master_uptime
)
<
0
)
return
-
1
;
if
(
tDecodeFloat
(
decoder
,
&
pInfo
->
master_uptime
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
monitor_interval
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
monitor_interval
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
dbs_total
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
stbs_total
)
<
0
)
return
-
1
;
if
(
tDecodeI64
(
decoder
,
&
pInfo
->
tbs_total
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vgroups_total
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vgroups_total
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vgroups_alive
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vgroups_alive
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vnodes_total
)
<
0
)
return
-
1
;
if
(
tDecodeI32
(
decoder
,
&
pInfo
->
vnodes_total
)
<
0
)
return
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录