Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
4f4100f9
T
TDengine
项目概览
taosdata
/
TDengine
11 个月 前同步成功
通知
1179
Star
22014
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4f4100f9
编写于
3月 02, 2022
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
monitor
上级
4cf8c0ac
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
147 addition
and
7 deletion
+147
-7
include/common/tglobal.h
include/common/tglobal.h
+1
-0
include/libs/monitor/monitor.h
include/libs/monitor/monitor.h
+22
-6
source/common/src/tglobal.c
source/common/src/tglobal.c
+3
-0
source/dnode/mgmt/impl/CMakeLists.txt
source/dnode/mgmt/impl/CMakeLists.txt
+1
-0
source/dnode/mgmt/impl/src/dndEnv.c
source/dnode/mgmt/impl/src/dndEnv.c
+9
-0
source/dnode/mgmt/impl/src/dndMgmt.c
source/dnode/mgmt/impl/src/dndMgmt.c
+10
-0
source/libs/monitor/inc/monInt.h
source/libs/monitor/inc/monInt.h
+17
-0
source/libs/monitor/src/monitor.c
source/libs/monitor/src/monitor.c
+79
-0
source/util/src/tjson.c
source/util/src/tjson.c
+5
-1
未找到文件。
include/common/tglobal.h
浏览文件 @
4f4100f9
...
...
@@ -57,6 +57,7 @@ extern bool tsEnableMonitor;
extern
int32_t
tsMonitorInterval
;
extern
char
tsMonitorFqdn
[];
extern
uint16_t
tsMonitorPort
;
extern
int32_t
tsMonitorMaxLogs
;
// query buffer management
extern
int32_t
tsQueryBufferSize
;
// maximum allowed usage buffer size in MB for each data node during query processing
...
...
include/libs/monitor/monitor.h
浏览文件 @
4f4100f9
...
...
@@ -23,8 +23,6 @@
extern
"C"
{
#endif
typedef
struct
SMonitor
SMonitor
;
typedef
struct
{
int32_t
dnode_id
;
char
dnode_ep
[
TSDB_EP_LEN
];
...
...
@@ -122,16 +120,34 @@ typedef struct {
char
content
[
1024
];
}
SMonLogItem
;
typedef
struct
{
SArray
*
logs
;
// array of SMonLogItem
}
SMonLogInfo
;
typedef
struct
{
int32_t
expire_time
;
int32_t
timeseries_used
;
int32_t
timeseries_total
;
}
SMonGrantInfo
;
typedef
struct
SMonInfo
SMonInfo
;
typedef
struct
{
const
char
*
server
;
uint16_t
port
;
int32_t
maxLogs
;
}
SMonCfg
;
int32_t
monInit
(
const
SMonCfg
*
pCfg
);
void
monCleanup
();
void
monAddLogItem
(
SMonLogItem
*
pItem
);
SMonInfo
*
monCreateMonitorInfo
();
void
monSetBasicInfo
(
SMonInfo
*
pMonitor
,
SMonBasicInfo
*
pInfo
);
void
monSetClusterInfo
(
SMonInfo
*
pMonitor
,
SMonClusterInfo
*
pInfo
);
void
monSetDnodeInfo
(
SMonInfo
*
pMonitor
,
SMonDnodeInfo
*
pInfo
);
void
monSetDiskInfo
(
SMonInfo
*
pMonitor
,
SMonDiskInfo
*
pInfo
);
void
monSetVgroupInfo
(
SMonInfo
*
pMonitor
,
SMonVgroupInfo
*
pInfo
);
void
monSetGrantInfo
(
SMonInfo
*
pMonitor
,
SMonVgroupInfo
*
pInfo
);
void
monSendReport
(
SMonInfo
*
pMonitor
);
void
monCleanupMonitorInfo
(
SMonInfo
*
pMonitor
);
#ifdef __cplusplus
}
#endif
...
...
source/common/src/tglobal.c
浏览文件 @
4f4100f9
...
...
@@ -51,6 +51,7 @@ bool tsEnableMonitor = 1;
int32_t
tsMonitorInterval
=
5
;
char
tsMonitorFqdn
[
TSDB_FQDN_LEN
]
=
{
0
};
uint16_t
tsMonitorPort
=
6043
;
int32_t
tsMonitorMaxLogs
=
100
;
/*
* denote if the server needs to compress response message at the application layer to client, including query rsp,
...
...
@@ -325,6 +326,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
if
(
cfgAddInt32
(
pCfg
,
"monitorInterval"
,
tsMonitorInterval
,
1
,
360000
,
0
)
!=
0
)
return
-
1
;
if
(
cfgAddString
(
pCfg
,
"monitorFqdn"
,
tsMonitorFqdn
,
0
)
!=
0
)
return
-
1
;
if
(
cfgAddInt32
(
pCfg
,
"monitorPort"
,
tsMonitorPort
,
1
,
65056
,
0
)
!=
0
)
return
-
1
;
if
(
cfgAddInt32
(
pCfg
,
"monitorMaxLogs"
,
tsMonitorMaxLogs
,
1
,
1000000
,
0
)
!=
0
)
return
-
1
;
return
0
;
}
...
...
@@ -441,6 +443,7 @@ static void taosSetServerCfg(SConfig *pCfg) {
tsMonitorInterval
=
cfgGetItem
(
pCfg
,
"monitorInterval"
)
->
i32
;
tstrncpy
(
tsMonitorFqdn
,
cfgGetItem
(
pCfg
,
"monitorFqdn"
)
->
str
,
TSDB_FQDN_LEN
);
tsMonitorPort
=
(
uint16_t
)
cfgGetItem
(
pCfg
,
"monitorPort"
)
->
i32
;
tsMonitorMaxLogs
=
cfgGetItem
(
pCfg
,
"monitorMaxLogs"
)
->
i32
;
if
(
tsQueryBufferSize
>=
0
)
{
tsQueryBufferSizeBytes
=
tsQueryBufferSize
*
1048576UL
;
...
...
source/dnode/mgmt/impl/CMakeLists.txt
浏览文件 @
4f4100f9
...
...
@@ -12,6 +12,7 @@ target_link_libraries(
PUBLIC sync
PUBLIC taos
PUBLIC tfs
PUBLIC monitor
)
target_include_directories
(
dnode
...
...
source/dnode/mgmt/impl/src/dndEnv.c
浏览文件 @
4f4100f9
...
...
@@ -21,6 +21,7 @@
#include "dndSnode.h"
#include "dndTransport.h"
#include "dndVnodes.h"
#include "monitor.h"
#include "sync.h"
#include "tfs.h"
#include "wal.h"
...
...
@@ -297,6 +298,13 @@ int32_t dndInit() {
return
-
1
;
}
SMonCfg
monCfg
=
{.
maxLogs
=
tsMonitorMaxLogs
,
.
port
=
tsMonitorPort
,
.
server
=
tsMonitorFqdn
};
if
(
monInit
(
&
monCfg
)
!=
0
)
{
dError
(
"failed to init monitor since %s"
,
terrstr
());
dndCleanup
();
return
-
1
;
}
dInfo
(
"dnode env is initialized"
);
return
0
;
}
...
...
@@ -310,6 +318,7 @@ void dndCleanup() {
walCleanUp
();
vnodeCleanup
();
rpcCleanup
();
monCleanup
();
taosStopCacheRefreshWorker
();
dInfo
(
"dnode env is cleaned up"
);
...
...
source/dnode/mgmt/impl/src/dndMgmt.c
浏览文件 @
4f4100f9
...
...
@@ -22,6 +22,7 @@
#include "dndTransport.h"
#include "dndVnodes.h"
#include "dndWorker.h"
#include "monitor.h"
static
void
dndProcessMgmtQueue
(
SDnode
*
pDnode
,
SRpcMsg
*
pMsg
);
...
...
@@ -475,8 +476,17 @@ void dndProcessStartupReq(SDnode *pDnode, SRpcMsg *pReq) {
static
void
dndSendMonitorReport
(
SDnode
*
pDnode
)
{
if
(
!
tsEnableMonitor
||
tsMonitorFqdn
[
0
]
==
0
)
return
;
SMonInfo
*
pMonitor
=
monCreateMonitorInfo
();
if
(
pMonitor
==
NULL
)
return
;
dTrace
(
"pDnode:%p, send monitor report to %s:%u"
,
pDnode
,
tsMonitorFqdn
,
tsMonitorPort
);
SMonBasicInfo
basicInfo
=
{.
dnode_id
=
dndGetDnodeId
(
pDnode
)};
tstrncpy
(
basicInfo
.
dnode_ep
,
tsLocalEp
,
TSDB_EP_LEN
);
monSetBasicInfo
(
pMonitor
,
&
basicInfo
);
monSendReport
(
pMonitor
);
monCleanupMonitorInfo
(
pMonitor
);
}
static
void
*
dnodeThreadRoutine
(
void
*
param
)
{
...
...
source/libs/monitor/inc/monInt.h
浏览文件 @
4f4100f9
...
...
@@ -18,6 +18,23 @@
#include "monitor.h"
#include "tarray.h"
#include "tlockfree.h"
#include "tjson.h"
typedef
struct
{
SRWLatch
lock
;
SArray
*
logs
;
// array of SMonLogItem
int32_t
maxLogs
;
const
char
*
server
;
uint16_t
port
;
}
SMonitor
;
typedef
struct
SMonInfo
{
SArray
*
logs
;
// array of SMonLogItem
SJson
*
pJson
;
}
SMonInfo
;
#ifdef __cplusplus
}
#endif
...
...
source/libs/monitor/src/monitor.c
浏览文件 @
4f4100f9
...
...
@@ -15,4 +15,83 @@
#define _DEFAULT_SOURCE
#include "monInt.h"
#include "taoserror.h"
#include "thttp.h"
#include "tlog.h"
static
SMonitor
tsMonitor
=
{
0
};
int32_t
monInit
(
const
SMonCfg
*
pCfg
)
{
tsMonitor
.
logs
=
taosArrayInit
(
16
,
sizeof
(
SMonInfo
));
if
(
tsMonitor
.
logs
==
NULL
)
{
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
return
-
1
;
}
tsMonitor
.
maxLogs
=
pCfg
->
maxLogs
;
tsMonitor
.
server
=
pCfg
->
server
;
tsMonitor
.
port
=
pCfg
->
port
;
taosInitRWLatch
(
&
tsMonitor
.
lock
);
return
0
;
}
void
monCleanup
()
{
taosArrayDestroy
(
tsMonitor
.
logs
);
tsMonitor
.
logs
=
NULL
;
}
void
monAddLogItem
(
SMonLogItem
*
pItem
)
{
taosWLockLatch
(
&
tsMonitor
.
lock
);
int32_t
size
=
taosArrayGetSize
(
tsMonitor
.
logs
);
if
(
size
>
tsMonitor
.
maxLogs
)
{
uInfo
(
"too many logs for monitor"
);
}
else
{
taosArrayPush
(
tsMonitor
.
logs
,
pItem
);
}
taosWUnLockLatch
(
&
tsMonitor
.
lock
);
}
SMonInfo
*
monCreateMonitorInfo
()
{
SMonInfo
*
pMonitor
=
calloc
(
1
,
sizeof
(
SMonInfo
));
if
(
pMonitor
==
NULL
)
return
NULL
;
taosWLockLatch
(
&
tsMonitor
.
lock
);
pMonitor
->
logs
=
taosArrayDup
(
pMonitor
->
logs
);
taosArrayClear
(
tsMonitor
.
logs
);
taosWUnLockLatch
(
&
tsMonitor
.
lock
);
pMonitor
->
pJson
=
tjsonCreateObject
();
if
(
pMonitor
->
pJson
==
NULL
||
pMonitor
->
logs
==
NULL
)
{
terrno
=
TSDB_CODE_OUT_OF_MEMORY
;
monCleanupMonitorInfo
(
pMonitor
);
return
NULL
;
}
return
pMonitor
;
}
void
monCleanupMonitorInfo
(
SMonInfo
*
pMonitor
)
{
taosArrayDestroy
(
pMonitor
->
logs
);
tjsonDelete
(
pMonitor
->
pJson
);
free
(
pMonitor
);
}
void
monSendReport
(
SMonInfo
*
pMonitor
)
{
char
*
pCont
=
tjsonToString
(
pMonitor
->
pJson
);
if
(
pCont
!=
NULL
)
{
taosSendHttpReport
(
tsMonitor
.
server
,
tsMonitor
.
port
,
pCont
,
strlen
(
pCont
));
free
(
pCont
);
}
}
void
monSetBasicInfo
(
SMonInfo
*
pMonitor
,
SMonBasicInfo
*
pInfo
)
{
SJson
*
pJson
=
pMonitor
->
pJson
;
tjsonAddDoubleToObject
(
pJson
,
"dnode_id"
,
pInfo
->
dnode_id
);
tjsonAddStringToObject
(
pJson
,
"dnode_ep"
,
pInfo
->
dnode_ep
);
}
void
monSetClusterInfo
(
SMonInfo
*
pMonitor
,
SMonClusterInfo
*
pInfo
);
void
monSetDnodeInfo
(
SMonInfo
*
pMonitor
,
SMonDnodeInfo
*
pInfo
);
void
monSetDiskInfo
(
SMonInfo
*
pMonitor
,
SMonDiskInfo
*
pInfo
);
void
monSetVgroupInfo
(
SMonInfo
*
pMonitor
,
SMonVgroupInfo
*
pInfo
);
void
monSetGrantInfo
(
SMonInfo
*
pMonitor
,
SMonVgroupInfo
*
pInfo
);
source/util/src/tjson.c
浏览文件 @
4f4100f9
...
...
@@ -26,7 +26,11 @@ SJson* tjsonCreateObject() {
return
pJson
;
}
void
tjsonDelete
(
SJson
*
pJson
)
{
cJSON_Delete
((
cJSON
*
)
pJson
);
}
void
tjsonDelete
(
SJson
*
pJson
)
{
if
(
pJson
!=
NULL
)
{
cJSON_Delete
((
cJSON
*
)
pJson
);
}
}
int32_t
tjsonAddIntegerToObject
(
SJson
*
pJson
,
const
char
*
pName
,
const
uint64_t
number
)
{
char
tmp
[
40
]
=
{
0
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录