xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-5861]<feature>:add uptime and dnodeId

This commit is contained in:
shenglian zhou 2021-08-09 17:15:20 +08:00 committed by shenglian zhou
parent 0d532d15de
commit 2659b46e16
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/inc/tglobal.h
View File

@ -41,6 +41,7 @@ extern char tsArbitrator[];
extern int8_t tsArbOnline; extern int8_t tsArbOnline;
extern int64_t tsArbOnlineTimestamp; extern int64_t tsArbOnlineTimestamp;
extern int32_t tsDnodeId; extern int32_t tsDnodeId;
extern int64_t tsDnodeStartTime;
// common // common
extern int tsRpcTimer; extern int tsRpcTimer;

1
src/common/src/tglobal.c
View File

@ -46,6 +46,7 @@ int8_t tsArbOnline = 0;
int64_t tsArbOnlineTimestamp = TSDB_ARB_DUMMY_TIME; int64_t tsArbOnlineTimestamp = TSDB_ARB_DUMMY_TIME;
char tsEmail[TSDB_FQDN_LEN] = {0}; char tsEmail[TSDB_FQDN_LEN] = {0};
int32_t tsDnodeId = 0; int32_t tsDnodeId = 0;
int64_t tsDnodeStartTime = 0;
// common // common
int32_t tsRpcTimer = 300; int32_t tsRpcTimer = 300;

1
src/dnode/src/dnodeMain.c
View File

@ -195,6 +195,7 @@ int32_t dnodeInitSystem() {
dnodeSetRunStatus(TSDB_RUN_STATUS_RUNING); dnodeSetRunStatus(TSDB_RUN_STATUS_RUNING);
moduleStart(); moduleStart();
tsDnodeStartTime = taosGetTimestampMs();
dnodeReportStep("TDengine", "initialized successfully", 1); dnodeReportStep("TDengine", "initialized successfully", 1);
dInfo("TDengine is initialized successfully"); dInfo("TDengine is initialized successfully");

15
src/plugins/http/src/httpMetricsHandle.c
View File

@ -30,6 +30,21 @@ bool metricsProcessRequest(HttpContext* pContext) {
httpWriteJsonBufHead(jsonBuf); httpWriteJsonBufHead(jsonBuf);
httpJsonToken(jsonBuf, JsonObjStt); httpJsonToken(jsonBuf, JsonObjStt);
{
int32_t dnodeId = dnodeGetDnodeId();
char* keyDnodeId = "dnode_id";
httpJsonPairIntVal(jsonBuf, keyDnodeId, strlen(keyDnodeId), dnodeId);
}
{
if (tsDnodeStartTime != 0) {
int64_t now = taosGetTimestampMs();
int64_t upTime = now-tsDnodeStartTime;
char* keyUpTime = "up_time";
httpJsonPairInt64Val(jsonBuf, keyUpTime, strlen(keyUpTime), upTime);
}
}
{ {
int32_t cpuCores = taosGetCpuCores(); int32_t cpuCores = taosGetCpuCores();
char* keyCpuCores = "cpu_cores"; char* keyCpuCores = "cpu_cores";