Merge pull request #10564 from taosdata/feature/config

sysinfo for monitor

include/libs/monitor/monitor.h

@@ -86,21 +86,21 @@ typedef struct {
 
 typedef struct {
   float   uptime;  // day
-  float   cpu_engine;
-  float   cpu_system;
+  double  cpu_engine;
+  double  cpu_system;
   float   cpu_cores;
   int64_t mem_engine;   // KB
   int64_t mem_system;   // KB
   int64_t mem_total;    // KB
-  float   disk_engine;    // GB
-  float   disk_used;      // GB
-  float   disk_total;     // GB
-  int64_t net_in;
-  int64_t net_out;
-  float   io_read;
-  float   io_write;
-  float   io_read_disk;
-  float   io_write_disk;
+  int64_t disk_engine;  // Byte
+  int64_t disk_used;    // Byte
+  int64_t disk_total;   // Byte
+  double  net_in;       // bytes per second
+  double  net_out;      // bytes per second
+  double  io_read;
+  double  io_write;
+  double  io_read_disk;
+  double  io_write_disk;
   int32_t req_select;
   float   req_select_rate;
   int32_t req_insert;

include/os/osSysinfo.h

@@ -38,15 +38,15 @@ int32_t taosGetEmail(char *email, int32_t maxLen);
 int32_t taosGetOsReleaseName(char *releaseName, int32_t maxLen);
 int32_t taosGetCpuInfo(char *cpuModel, int32_t maxLen, float *numOfCores);
 int32_t taosGetCpuCores(float *numOfCores);
-int32_t taosGetCpuUsage(float *cpu_system, float *cpu_engine);
+int32_t taosGetCpuUsage(double *cpu_system, double *cpu_engine);
 int32_t taosGetTotalMemory(int64_t *totalKB);
 int32_t taosGetProcMemory(int64_t *usedKB);
 int32_t taosGetSysMemory(int64_t *usedKB);
 int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize);
-int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars);
-int32_t taosGetProcIO(float *readKB, float *writeKB);
-int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes);
-int32_t taosGetBandSpeed(float *bandSpeedKb);
+int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes);
+int32_t taosGetIOSpeed(double *readKB, double *writeKB, double *readDiskKB, double *writeDiskKB);
+int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes);
+int32_t taosGetBandSpeed(double *receive_bytes_per_sec, double *transmit_bytes_per_sec);
 
 int32_t taosSystem(const char *cmd);
 void    taosKillSystem();

source/dnode/mgmt/impl/inc/dndEnv.h

@@ -108,6 +108,7 @@ typedef struct {
   SHashObj    *hash;
   int32_t      openVnodes;
   int32_t      totalVnodes;
+  int32_t      masterNum;
   SRWLatch     latch;
   SQWorkerPool queryPool;
   SFWorkerPool fetchPool;

source/dnode/mgmt/impl/src/dndMgmt.c

@@ -487,12 +487,10 @@ static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
   taosGetSysMemory(&pInfo->mem_system);
   pInfo->mem_total = tsTotalMemoryKB;
   pInfo->disk_engine = 0;
-  pInfo->disk_used = tsDataSpace.size.used / (1024 * 1024 * 1024.0);
-  pInfo->disk_total = tsDataSpace.size.avail / (1024 * 1024 * 1024.0);
-  taosGetCardInfo(NULL, &pInfo->net_in, &pInfo->net_out);
-  taosGetProcIO(&pInfo->io_read, &pInfo->io_write);
-  pInfo->io_read_disk = 0;
-  pInfo->io_write_disk = 0;
+  pInfo->disk_used = tsDataSpace.size.used;
+  pInfo->disk_total = tsDataSpace.size.total;
+  taosGetBandSpeed(&pInfo->net_in, &pInfo->net_out);
+  taosGetIOSpeed(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk);
   pInfo->req_select = 0;
   pInfo->req_select_rate = 0;
   pInfo->req_insert = 0;
@@ -501,9 +499,9 @@ static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
   pInfo->req_insert_batch = 0;
   pInfo->req_insert_batch_success = 0;
   pInfo->req_insert_batch_rate = 0;
-  pInfo->errors = 0;
-  pInfo->vnodes_num = 0;
-  pInfo->masters = 0;
+  pInfo->errors = tsNumOfErrorLogs;
+  pInfo->vnodes_num = pDnode->vmgmt.totalVnodes;
+  pInfo->masters = pDnode->vmgmt.masterNum;
   pInfo->has_mnode = dndIsMnode(pDnode);
 }
 

source/dnode/mgmt/impl/src/dndVnodes.c

@@ -17,6 +17,7 @@
 #include "dndVnodes.h"
 #include "dndMgmt.h"
 #include "dndTransport.h"
+#include "sync.h"
 
 typedef struct {
   int32_t  vgId;
@@ -979,6 +980,8 @@ void dndCleanupVnodes(SDnode *pDnode) {
 
 void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
   SVnodesMgmt *pMgmt = &pDnode->vmgmt;
+  int32_t      totalVnodes = 0;
+  int32_t      masterNum = 0;
 
   taosRLockLatch(&pMgmt->latch);
 
@@ -993,8 +996,12 @@ void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
     vnodeGetLoad(pVnode->pImpl, &vload);
     taosArrayPush(pLoads, &vload);
 
+    totalVnodes++;
+    if (vload.role == TAOS_SYNC_STATE_LEADER) masterNum++;
     pIter = taosHashIterate(pMgmt->hash, pIter);
   }
 
   taosRUnLockLatch(&pMgmt->latch);
+  pMgmt->totalVnodes = totalVnodes;
+  pMgmt->masterNum = masterNum;
 }

source/os/src/osSysinfo.c

@@ -87,7 +87,7 @@ int32_t taosGetCpuCores(float *numOfCores) {
   return 0;
 }
 
-int32_t taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
+int32_t taosGetCpuUsage(double *sysCpuUsage, double *procCpuUsage) {
   *sysCpuUsage = 0;
   *procCpuUsage = 0;
   return 0;
@@ -112,64 +112,32 @@ int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize) {
   }
 }
 
-int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes) {
-  if (bytes) *bytes = 0;
-  if (rbytes) *rbytes = 0;
-  if (tbytes) *tbytes = 0;
+int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
+  *receive_bytes = 0;
+  *transmit_bytes = 0;
   return 0;
 }
 
-int32_t taosGetBandSpeed(float *bandSpeedKb) {
-  *bandSpeedKb = 0;
-  return 0;
-}
-
-int32_t taosReadProcIO(int64_t *readbyte, int64_t *writebyte) {
+int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
   IO_COUNTERS io_counter;
   if (GetProcessIoCounters(GetCurrentProcess(), &io_counter)) {
-    if (readbyte) *readbyte = io_counter.ReadTransferCount;
-    if (writebyte) *writebyte = io_counter.WriteTransferCount;
+    if (rchars) *rchars = io_counter.ReadTransferCount;
+    if (wchars) *wchars = io_counter.WriteTransferCount;
+    if (read_bytes) *read_bytes = 0;
+    if (write_bytes) *write_bytes = 0;
     return 0;
   }
   return -1;
 }
 
-int32_t taosGetProcIO(float *readKB, float *writeKB) {
-  static int64_t lastReadbyte = -1;
-  static int64_t lastWritebyte = -1;
-
-  int64_t curReadbyte = 0;
-  int64_t curWritebyte = 0;
-
-  if (taosReadProcIO(&curReadbyte, &curWritebyte) != 0) {
-    return -1;
-  }
-
-  if (lastReadbyte == -1 || lastWritebyte == -1) {
-    lastReadbyte = curReadbyte;
-    lastWritebyte = curWritebyte;
-    return -1;
-  }
-
-  *readKB = (float)((double)(curReadbyte - lastReadbyte) / 1024);
-  *writeKB = (float)((double)(curWritebyte - lastWritebyte) / 1024);
-  if (*readKB < 0) *readKB = 0;
-  if (*writeKB < 0) *writeKB = 0;
-
-  lastReadbyte = curReadbyte;
-  lastWritebyte = curWritebyte;
-
-  return 0;
-}
-
 void taosGetSystemInfo() {
   taosGetCpuCores(&tsNumOfCores);
   taosGetTotalMemory(&tsTotalMemoryKB);
 
-  float tmp1, tmp2;
-  taosGetBandSpeed(&tmp1);
+  double tmp1, tmp2, tmp3, tmp4;
+  taosGetBandSpeed(&tmp1, &tmp2);
   taosGetCpuUsage(&tmp1, &tmp2);
-  taosGetProcIO(&tmp1, &tmp2);
+  taosGetIOSpeed(&tmp1, &tmp2, &tmp3, &tmp4);
 }
 
 void taosKillSystem() {
@@ -259,31 +227,21 @@ void taosGetSystemInfo() {
   tsNumOfCores = sysconf(_SC_NPROCESSORS_ONLN);
 }
 
-int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars) {
+int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
   if (rchars) *rchars = 0;
   if (wchars) *wchars = 0;
+  if (read_bytes) *read_bytes = 0;
+  if (write_bytes) *write_bytes = 0;
   return 0;
 }
 
-int32_t taosGetProcIO(float *readKB, float *writeKB) {
-  *readKB = 0;
-  *writeKB = 0;
-  return 0;
-}
-
-int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes) {
-  if (bytes) *bytes = 0;
-  if (rbytes) *rbytes = 0;
-  if (tbytes) *tbytes = 0;
+int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
+  *receive_bytes = 0;
+  *transmit_bytes = 0;
   return 0;
 }
 
-int32_t taosGetBandSpeed(float *bandSpeedKb) {
-  *bandSpeedKb = 0;
-  return 0;
-}
-
-int32_t taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) {
+int32_t taosGetCpuUsage(double *sysCpuUsage, double *procCpuUsage) {
   *sysCpuUsage = 0;
   *procCpuUsage = 0;
   return 0;
@@ -400,7 +358,6 @@ int32_t taosGetSysMemory(int64_t *usedKB) {
 }
 
 int32_t taosGetProcMemory(int64_t *usedKB) {
-  // FILE *fp = fopen(tsProcMemFile, "r");
   TdFilePtr pFile = taosOpenFile(tsProcMemFile, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
     // printf("open file:%s failed", tsProcMemFile);
@@ -434,7 +391,6 @@ int32_t taosGetProcMemory(int64_t *usedKB) {
 }
 
 static int32_t taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
-  // FILE *fp = fopen(tsSysCpuFile, "r");
   TdFilePtr pFile = taosOpenFile(tsSysCpuFile, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
     // printf("open file:%s failed", tsSysCpuFile);
@@ -459,7 +415,6 @@ static int32_t taosGetSysCpuInfo(SysCpuInfo *cpuInfo) {
 }
 
 static int32_t taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
-  // FILE *fp = fopen(tsProcCpuFile, "r");
   TdFilePtr pFile = taosOpenFile(tsProcCpuFile, TD_FILE_READ | TD_FILE_STREAM);
   if (pFile == NULL) {
     // printf("open file:%s failed", tsProcCpuFile);
@@ -493,7 +448,7 @@ int32_t taosGetCpuCores(float *numOfCores) {
   return 0;
 }
 
-int32_t taosGetCpuUsage(float *cpu_system, float *cpu_engine) {
+int32_t taosGetCpuUsage(double *cpu_system, double *cpu_engine) {
   static uint64_t lastSysUsed = 0;
   static uint64_t lastSysTotal = 0;
   static uint64_t lastProcTotal = 0;
@@ -522,8 +477,8 @@ int32_t taosGetCpuUsage(float *cpu_system, float *cpu_engine) {
     return -1;
   }
 
-  *cpu_engine = (float)((double)(curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100);
-  *cpu_system = (float)((double)(curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100);
+  *cpu_engine = (curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100;
+  *cpu_system = (curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100;
 
   lastSysUsed = curSysUsed;
   lastSysTotal = curSysTotal;
@@ -544,14 +499,9 @@ int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize) {
   }
 }
 
-int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes) {
-  if (bytes) *bytes = 0;
-  // FILE *fp = fopen(tsSysNetFile, "r");
+int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
   TdFilePtr pFile = taosOpenFile(tsSysNetFile, TD_FILE_READ | TD_FILE_STREAM);
-  if (pFile == NULL) {
-    // printf("open file:%s failed", tsSysNetFile);
-    return -1;
-  }
+  if (pFile == NULL) return -1;
 
   ssize_t _bytes = 0;
   char   *line = NULL;
@@ -584,9 +534,8 @@ int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes) {
            "%s %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64 " %" PRId64
            " %" PRId64,
            nouse0, &o_rbytes, &rpackts, &nouse1, &nouse2, &nouse3, &nouse4, &nouse5, &nouse6, &o_tbytes, &tpackets);
-    if (rbytes) *rbytes = o_rbytes;
-    if (tbytes) *tbytes = o_tbytes;
-    if (bytes)  *bytes += (o_rbytes + o_tbytes);
+    *receive_bytes = o_rbytes;
+    *transmit_bytes = o_tbytes;
   }
 
   if (line != NULL) tfree(line);
@@ -595,58 +544,52 @@ int32_t taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes) {
   return 0;
 }
 
-int32_t taosGetBandSpeed(float *bandSpeedKb) {
-  static int64_t lastBytes = 0;
-  static time_t  lastTime = 0;
-  int64_t        curBytes = 0;
-  time_t         curTime = time(NULL);
+int32_t taosGetBandSpeed(double *receive_bytes_per_sec, double *transmit_bytes_per_sec) {
+  static int64_t last_receive_bytes = 0;
+  static int64_t last_transmit_bytes = 0;
+  static int64_t last_time = 0;
+  int64_t        cur_receive_bytes = 0;
+  int64_t        cur_transmit_bytes = 0;
+  int64_t        cur_time = taosGetTimestampMs();
 
-  if (taosGetCardInfo(&curBytes, NULL, NULL) != 0) {
+  if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) != 0) {
     return -1;
   }
 
-  if (lastTime == 0 || lastBytes == 0) {
-    lastTime = curTime;
-    lastBytes = curBytes;
-    *bandSpeedKb = 0;
-    return 0;
-  }
-
-  if (lastTime >= curTime || lastBytes > curBytes) {
-    lastTime = curTime;
-    lastBytes = curBytes;
-    *bandSpeedKb = 0;
+  if (last_time == 0 || last_time >= cur_time) {
+    last_time = cur_time;
+    last_receive_bytes = cur_receive_bytes;
+    last_transmit_bytes = cur_transmit_bytes;
+    *receive_bytes_per_sec = 0;
+    *transmit_bytes_per_sec = 0;
     return 0;
   }
 
-  double totalBytes = (double)(curBytes - lastBytes) / 1024 * 8;  // Kb
-  *bandSpeedKb = (float)(totalBytes / (double)(curTime - lastTime));
+  *receive_bytes_per_sec = (cur_receive_bytes - last_receive_bytes) / (double)(cur_time - last_time) * 1000;
+  *transmit_bytes_per_sec = (cur_transmit_bytes - last_transmit_bytes) / (double)(cur_time - last_time) * 1000;
 
-  // //printf("bandwidth lastBytes:%ld, lastTime:%ld, curBytes:%ld, curTime:%ld,
-  // speed:%f", lastBytes, lastTime, curBytes, curTime, *bandSpeed);
+  last_time = cur_time;
+  last_transmit_bytes = cur_transmit_bytes;
+  last_receive_bytes = cur_receive_bytes;
 
-  lastTime = curTime;
-  lastBytes = curBytes;
+  if (*receive_bytes_per_sec < 0) *receive_bytes_per_sec = 0;
+  if (*transmit_bytes_per_sec < 0) *transmit_bytes_per_sec = 0;
 
   return 0;
 }
 
-int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars) {
-  // FILE *fp = fopen(tsProcIOFile, "r");
+int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
   TdFilePtr pFile = taosOpenFile(tsProcIOFile, TD_FILE_READ | TD_FILE_STREAM);
-  if (pFile == NULL) {
-    // printf("open file:%s failed", tsProcIOFile);
-    return -1;
-  }
+  if (pFile == NULL) return -1;
 
   ssize_t _bytes = 0;
   char   *line = NULL;
-  char    tmp[10];
+  char    tmp[24];
   int     readIndex = 0;
 
   while (!taosEOFFile(pFile)) {
     _bytes = taosGetLineFile(pFile, &line);
-    if ((_bytes < 0) || (line == NULL)) {
+    if (_bytes < 10 || line == NULL) {
       break;
     }
     if (strstr(line, "rchar:") != NULL) {
@@ -655,47 +598,70 @@ int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars) {
     } else if (strstr(line, "wchar:") != NULL) {
       sscanf(line, "%s %" PRId64, tmp, wchars);
       readIndex++;
+    } else if (strstr(line, "read_bytes:") != NULL) {  // read_bytes
+      sscanf(line, "%s %" PRId64, tmp, read_bytes);
+      readIndex++;
+    } else if (strstr(line, "write_bytes:") != NULL) {  // write_bytes
+      sscanf(line, "%s %" PRId64, tmp, write_bytes);
+      readIndex++;
     } else {
     }
 
-    if (readIndex >= 2) break;
+    if (readIndex >= 4) break;
   }
 
   if (line != NULL) tfree(line);
   taosCloseFile(&pFile);
 
-  if (readIndex < 2) {
-    // printf("read file:%s failed", tsProcIOFile);
+  if (readIndex < 4) {
     return -1;
   }
 
   return 0;
 }
 
-int32_t taosGetProcIO(float *readKB, float *writeKB) {
-  static int64_t lastReadbyte = -1;
-  static int64_t lastWritebyte = -1;
+int32_t taosGetIOSpeed(double *rchar_per_sec, double *wchar_per_sec, double *read_bytes_per_sec,
+                       double *write_bytes_per_sec) {
+  static int64_t last_rchar = -1;
+  static int64_t last_wchar = -1;
+  static int64_t last_read_bytes = -1;
+  static int64_t last_write_bytes = -1;
+  static int64_t last_time = 0;
 
-  int64_t curReadbyte = 0;
-  int64_t curWritebyte = 0;
+  int64_t cur_rchar = 0;
+  int64_t cur_wchar = 0;
+  int64_t cur_read_bytes = 0;
+  int64_t cur_write_bytes = 0;
+  int64_t cur_time = taosGetTimestampMs();
 
-  if (taosReadProcIO(&curReadbyte, &curWritebyte) != 0) {
+  if (taosReadProcIO(&cur_rchar, &cur_wchar, &cur_read_bytes, &cur_write_bytes) != 0) {
     return -1;
   }
 
-  if (lastReadbyte == -1 || lastWritebyte == -1) {
-    lastReadbyte = curReadbyte;
-    lastWritebyte = curWritebyte;
+  if (last_time == 0 || last_time >= cur_time) {
+    last_time = cur_time;
+    last_rchar = cur_rchar;
+    last_wchar = cur_wchar;
+    last_read_bytes = cur_read_bytes;
+    last_write_bytes = cur_write_bytes;
     return -1;
   }
 
-  *readKB = (float)((double)(curReadbyte - lastReadbyte) / 1024);
-  *writeKB = (float)((double)(curWritebyte - lastWritebyte) / 1024);
-  if (*readKB < 0) *readKB = 0;
-  if (*writeKB < 0) *writeKB = 0;
+  *rchar_per_sec = (cur_rchar - last_rchar) / (double)(cur_time - last_time) * 1000;
+  *wchar_per_sec = (cur_wchar - last_wchar) / (double)(cur_time - last_time) * 1000;
+  *read_bytes_per_sec = (cur_read_bytes - last_read_bytes) / (double)(cur_time - last_time) * 1000;
+  *write_bytes_per_sec = (cur_write_bytes - last_write_bytes) / (double)(cur_time - last_time) * 1000;
+
+  last_time = cur_time;
+  last_rchar = cur_rchar;
+  last_wchar = cur_wchar;
+  last_read_bytes = cur_read_bytes;
+  last_write_bytes = cur_write_bytes;
 
-  lastReadbyte = curReadbyte;
-  lastWritebyte = curWritebyte;
+  if (*rchar_per_sec < 0) *rchar_per_sec = 0;
+  if (*wchar_per_sec < 0) *wchar_per_sec = 0;
+  if (*read_bytes_per_sec < 0) *read_bytes_per_sec = 0;
+  if (*write_bytes_per_sec < 0) *write_bytes_per_sec = 0;
 
   return 0;
 }
@@ -705,10 +671,10 @@ void taosGetSystemInfo() {
   taosGetCpuCores(&tsNumOfCores);
   taosGetTotalMemory(&tsTotalMemoryKB);
 
-  float tmp1, tmp2;
-  taosGetBandSpeed(&tmp1);
+  double tmp1, tmp2, tmp3, tmp4;
+  taosGetBandSpeed(&tmp1, &tmp2);
   taosGetCpuUsage(&tmp1, &tmp2);
-  taosGetProcIO(&tmp1, &tmp2);
+  taosGetIOSpeed(&tmp1, &tmp2, &tmp3, &tmp4);
 }
 
 void taosKillSystem() {