monitor

include/libs/monitor/monitor.h

@@ -95,20 +95,17 @@ typedef struct {
   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;
-  int32_t req_insert_success;
-  float   req_insert_rate;
-  int32_t req_insert_batch;
-  int32_t req_insert_batch_success;
-  float   req_insert_batch_rate;
+  int64_t net_in;       // bytes
+  int64_t net_out;      // bytes
+  int64_t io_read;      // bytes
+  int64_t io_write;     // bytes
+  int64_t io_read_disk;   // bytes
+  int64_t io_write_disk;  // bytes
+  int64_t req_select;
+  int64_t req_insert;
+  int64_t req_insert_success;
+  int64_t req_insert_batch;
+  int64_t req_insert_batch_success;
   int32_t errors;
   int32_t vnodes_num;
   int32_t masters;

include/os/osSysinfo.h

@@ -43,10 +43,8 @@ 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, int64_t *read_bytes, int64_t *write_bytes);
-int32_t taosGetIOSpeed(double *readKB, double *writeKB, double *readDiskKB, double *writeDiskKB);
+int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes);
 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

@@ -109,14 +109,10 @@ typedef struct {
   int32_t totalVnodes;
   int32_t masterNum;
   int64_t numOfSelectReqs;
-  double  speedOfSelectReqs;
   int64_t numOfInsertReqs;
   int64_t numOfInsertSuccessReqs;
-  double  speedOfInsertReqs;
   int64_t numOfBatchInsertReqs;
   int64_t numOfBatchInsertSuccessReqs;
-  double  speedOfBatchInsertReqs;
-  int64_t lastTime;
 } SVnodesStat;
 
 typedef struct {

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

@@ -489,18 +489,15 @@ static void dndGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
   pInfo->disk_engine = 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);
+  taosGetCardInfo(&pInfo->net_in, &pInfo->net_out);
+  taosGetProcIO(&pInfo->io_read, &pInfo->io_write, &pInfo->io_read_disk, &pInfo->io_write_disk);
 
   SVnodesStat *pStat = &pDnode->vmgmt.stat;
   pInfo->req_select = pStat->numOfSelectReqs;
-  pInfo->req_select_rate = pStat->speedOfSelectReqs;
   pInfo->req_insert = pStat->numOfInsertReqs;
   pInfo->req_insert_success = pStat->numOfInsertSuccessReqs;
-  pInfo->req_insert_rate = pStat->speedOfInsertReqs;
   pInfo->req_insert_batch = pStat->numOfBatchInsertReqs;
   pInfo->req_insert_batch_success = pStat->numOfBatchInsertSuccessReqs;
-  pInfo->req_insert_batch_rate = pStat->speedOfBatchInsertReqs;
   pInfo->errors = tsNumOfErrorLogs;
   pInfo->vnodes_num = pStat->totalVnodes;
   pInfo->masters = pStat->masterNum;

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

@@ -980,6 +980,7 @@ void dndCleanupVnodes(SDnode *pDnode) {
 
 void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
   SVnodesMgmt *pMgmt = &pDnode->vmgmt;
+  SVnodesStat *pStat = &pMgmt->stat;
   int32_t      totalVnodes = 0;
   int32_t      masterNum = 0;
   int64_t      numOfSelectReqs = 0;
@@ -990,7 +991,7 @@ void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
 
   taosRLockLatch(&pMgmt->latch);
 
-  void   *pIter = taosHashIterate(pMgmt->hash, NULL);
+  void *pIter = taosHashIterate(pMgmt->hash, NULL);
   while (pIter) {
     SVnodeObj **ppVnode = pIter;
     if (ppVnode == NULL || *ppVnode == NULL) continue;
@@ -1013,25 +1014,8 @@ void dndGetVnodeLoads(SDnode *pDnode, SArray *pLoads) {
 
   taosRUnLockLatch(&pMgmt->latch);
 
-  SVnodesStat *pStat = &pMgmt->stat;
   pStat->totalVnodes = totalVnodes;
   pStat->masterNum = masterNum;
-
-  int64_t curTime = taosGetTimestampMs();
-  if (pStat->lastTime == 0 || pStat->lastTime >= curTime) {
-    pStat->lastTime = curTime;
-    pStat->numOfSelectReqs = numOfSelectReqs;
-    pStat->numOfInsertReqs = numOfInsertReqs;
-    pStat->numOfInsertSuccessReqs = numOfInsertSuccessReqs;
-    pStat->numOfBatchInsertReqs = numOfBatchInsertReqs;
-    pStat->numOfBatchInsertSuccessReqs = numOfBatchInsertSuccessReqs;
-    return;
-  }
-
-  double interval = (curTime - pStat->lastTime) * 1000.0;
-  pStat->speedOfSelectReqs = (numOfSelectReqs - pStat->numOfSelectReqs) / interval;
-  pStat->speedOfInsertReqs = (numOfInsertReqs - pStat->numOfInsertReqs) / interval;
-  pStat->speedOfBatchInsertReqs = (numOfBatchInsertReqs - pStat->numOfBatchInsertReqs) / interval;
   pStat->numOfSelectReqs = numOfSelectReqs;
   pStat->numOfInsertReqs = numOfInsertReqs;
   pStat->numOfInsertSuccessReqs = numOfInsertSuccessReqs;

source/libs/monitor/inc/monInt.h

@@ -28,9 +28,24 @@ typedef struct {
   char      content[MON_LOG_LEN];
 } SMonLogItem;
 
+typedef struct {
+  int64_t time;
+  int64_t req_select;
+  int64_t req_insert;
+  int64_t req_insert_batch;
+  int64_t net_in;
+  int64_t net_out;
+  int64_t io_read;
+  int64_t io_write;
+  int64_t io_read_disk;
+  int64_t io_write_disk;
+} SMonState;
+
 typedef struct SMonInfo {
-  SArray *logs;  // array of SMonLogItem
-  SJson  *pJson;
+  int64_t   curTime;
+  SMonState lastState;
+  SArray   *logs;  // array of SMonLogItem
+  SJson    *pJson;
 } SMonInfo;
 
 typedef struct {
@@ -39,6 +54,7 @@ typedef struct {
   int32_t         maxLogs;
   const char     *server;
   uint16_t        port;
+  SMonState       state;
 } SMonitor;
 
 #ifdef __cplusplus

source/libs/monitor/src/monitor.c

@@ -46,6 +46,7 @@ int32_t monInit(const SMonCfg *pCfg) {
   tsMonitor.server = pCfg->server;
   tsMonitor.port = pCfg->port;
   tsLogFp = monRecordLog;
+  tsMonitor.state.time = taosGetTimestampMs();
   pthread_mutex_init(&tsMonitor.lock, NULL);
   return 0;
 }
@@ -76,20 +77,23 @@ SMonInfo *monCreateMonitorInfo() {
     return NULL;
   }
 
+  pMonitor->curTime = taosGetTimestampMs();
+  pMonitor->lastState = tsMonitor.state;
   return pMonitor;
 }
 
 void monCleanupMonitorInfo(SMonInfo *pMonitor) {
+  tsMonitor.state = pMonitor->lastState;
+  tsMonitor.state.time = pMonitor->curTime;
   taosArrayDestroy(pMonitor->logs);
   tjsonDelete(pMonitor->pJson);
   free(pMonitor);
 }
 
 void monSetBasicInfo(SMonInfo *pMonitor, SMonBasicInfo *pInfo) {
-  SJson  *pJson = pMonitor->pJson;
-  int64_t ms = taosGetTimestampMs();
-  char    buf[40] = {0};
-  taosFormatUtcTime(buf, sizeof(buf), ms, TSDB_TIME_PRECISION_MILLI);
+  SJson *pJson = pMonitor->pJson;
+  char   buf[40] = {0};
+  taosFormatUtcTime(buf, sizeof(buf), pMonitor->curTime, TSDB_TIME_PRECISION_MILLI);
 
   tjsonAddStringToObject(pJson, "ts", buf);
   tjsonAddDoubleToObject(pJson, "dnode_id", pInfo->dnode_id);
@@ -203,6 +207,27 @@ void monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
     return;
   }
 
+  SMonState *pLast = &pMonitor->lastState;
+  double     interval = (pMonitor->curTime - pLast->time) / 1000.0;
+  double     req_select_rate = (pInfo->req_select - pLast->req_select) / interval;
+  double     req_insert_rate = (pInfo->req_insert - pLast->req_insert) / interval;
+  double     req_insert_batch_rate = (pInfo->req_insert_batch - pLast->req_insert_batch) / interval;
+  double     net_in_rate = (pInfo->net_in - pLast->net_in) / interval;
+  double     net_out_rate = (pInfo->net_out - pLast->net_out) / interval;
+  double     io_read_rate = (pInfo->io_read - pLast->io_read) / interval;
+  double     io_write_rate = (pInfo->io_write - pLast->io_write) / interval;
+  double     io_read_disk_rate = (pInfo->io_read_disk - pLast->io_read_disk) / interval;
+  double     io_write_disk_rate = (pInfo->io_write_disk - pLast->io_write_disk) / interval;
+  pLast->req_select = pInfo->req_select;
+  pLast->req_insert = pInfo->req_insert;
+  pLast->req_insert_batch = pInfo->req_insert_batch;
+  pLast->net_in = pInfo->net_in;
+  pLast->net_out = pInfo->net_out;
+  pLast->io_read = pInfo->io_read;
+  pLast->io_write = pInfo->io_write;
+  pLast->io_read_disk = pInfo->io_read_disk;
+  pLast->io_write_disk = pInfo->io_write_disk;
+
   tjsonAddDoubleToObject(pJson, "uptime", pInfo->uptime);
   tjsonAddDoubleToObject(pJson, "cpu_engine", pInfo->cpu_engine);
   tjsonAddDoubleToObject(pJson, "cpu_system", pInfo->cpu_system);
@@ -213,20 +238,20 @@ void monSetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
   tjsonAddDoubleToObject(pJson, "disk_engine", pInfo->disk_engine);
   tjsonAddDoubleToObject(pJson, "disk_used", pInfo->disk_used);
   tjsonAddDoubleToObject(pJson, "disk_total", pInfo->disk_total);
-  tjsonAddDoubleToObject(pJson, "net_in", pInfo->net_in);
-  tjsonAddDoubleToObject(pJson, "net_out", pInfo->net_out);
-  tjsonAddDoubleToObject(pJson, "io_read", pInfo->io_read);
-  tjsonAddDoubleToObject(pJson, "io_write", pInfo->io_write);
-  tjsonAddDoubleToObject(pJson, "io_read_disk", pInfo->io_read_disk);
-  tjsonAddDoubleToObject(pJson, "io_write_disk", pInfo->io_write_disk);
+  tjsonAddDoubleToObject(pJson, "net_in", net_in_rate);
+  tjsonAddDoubleToObject(pJson, "net_out", net_out_rate);
+  tjsonAddDoubleToObject(pJson, "io_read", io_read_rate);
+  tjsonAddDoubleToObject(pJson, "io_write", io_write_rate);
+  tjsonAddDoubleToObject(pJson, "io_read_disk", io_read_disk_rate);
+  tjsonAddDoubleToObject(pJson, "io_write_disk", io_write_disk_rate);
   tjsonAddDoubleToObject(pJson, "req_select", pInfo->req_select);
-  tjsonAddDoubleToObject(pJson, "req_select_rate", pInfo->req_select_rate);
+  tjsonAddDoubleToObject(pJson, "req_select_rate", req_select_rate);
   tjsonAddDoubleToObject(pJson, "req_insert", pInfo->req_insert);
   tjsonAddDoubleToObject(pJson, "req_insert_success", pInfo->req_insert_success);
-  tjsonAddDoubleToObject(pJson, "req_insert_rate", pInfo->req_insert_rate);
+  tjsonAddDoubleToObject(pJson, "req_insert_rate", req_insert_rate);
   tjsonAddDoubleToObject(pJson, "req_insert_batch", pInfo->req_insert_batch);
   tjsonAddDoubleToObject(pJson, "req_insert_batch_success", pInfo->req_insert_batch_success);
-  tjsonAddDoubleToObject(pJson, "req_insert_batch_rate", pInfo->req_insert_batch_rate);
+  tjsonAddDoubleToObject(pJson, "req_insert_batch_rate", req_insert_batch_rate);
   tjsonAddDoubleToObject(pJson, "errors", pInfo->errors);
   tjsonAddDoubleToObject(pJson, "vnodes_num", pInfo->vnodes_num);
   tjsonAddDoubleToObject(pJson, "masters", pInfo->masters);

source/libs/monitor/test/monTest.cpp

@@ -142,13 +142,10 @@ void MonitorTest::GetDnodeInfo(SMonInfo *pMonitor, SMonDnodeInfo *pInfo) {
   pInfo->io_read_disk = 7.1;
   pInfo->io_write_disk = 7.2;
   pInfo->req_select = 8;
-  pInfo->req_select_rate = 8.1;
   pInfo->req_insert = 9;
   pInfo->req_insert_success = 10;
-  pInfo->req_insert_rate = 10.1;
   pInfo->req_insert_batch = 11;
   pInfo->req_insert_batch_success = 12;
-  pInfo->req_insert_batch_rate = 12.3;
   pInfo->errors = 4;
   pInfo->vnodes_num = 5;
   pInfo->masters = 6;

source/os/src/osSysinfo.c

@@ -118,7 +118,7 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
   return 0;
 }
 
-int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
+int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
   IO_COUNTERS io_counter;
   if (GetProcessIoCounters(GetCurrentProcess(), &io_counter)) {
     if (rchars) *rchars = io_counter.ReadTransferCount;
@@ -135,9 +135,7 @@ void taosGetSystemInfo() {
   taosGetTotalMemory(&tsTotalMemoryKB);
 
   double tmp1, tmp2, tmp3, tmp4;
-  taosGetBandSpeed(&tmp1, &tmp2);
   taosGetCpuUsage(&tmp1, &tmp2);
-  taosGetIOSpeed(&tmp1, &tmp2, &tmp3, &tmp4);
 }
 
 void taosKillSystem() {
@@ -227,7 +225,7 @@ void taosGetSystemInfo() {
   tsNumOfCores = sysconf(_SC_NPROCESSORS_ONLN);
 }
 
-int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
+int32_t taosGetProcIO(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;
@@ -336,7 +334,7 @@ static char  tsProcCpuFile[25] = {0};
 static char  tsProcMemFile[25] = {0};
 static char  tsProcIOFile[25] = {0};
 
-static void taosGetProcInfos() {
+static void taosGetProcIOnfos() {
   tsPageSizeKB = sysconf(_SC_PAGESIZE) / 1024;
   tsOpenMax = sysconf(_SC_OPEN_MAX);
   tsStreamMax = sysconf(_SC_STREAM_MAX);
@@ -544,41 +542,7 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
   return 0;
 }
 
-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(&cur_receive_bytes, &cur_transmit_bytes) != 0) {
-    return -1;
-  }
-
-  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;
-  }
-
-  *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;
-
-  last_time = cur_time;
-  last_transmit_bytes = cur_transmit_bytes;
-  last_receive_bytes = cur_receive_bytes;
-
-  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, int64_t *read_bytes, int64_t *write_bytes) {
+int32_t taosGetProcIO(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) return -1;
 
@@ -620,61 +584,13 @@ int32_t taosReadProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, in
   return 0;
 }
 
-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 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(&cur_rchar, &cur_wchar, &cur_read_bytes, &cur_write_bytes) != 0) {
-    return -1;
-  }
-
-  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;
-  }
-
-  *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;
-
-  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;
-}
-
 void taosGetSystemInfo() {
-  taosGetProcInfos();
+  taosGetProcIOnfos();
   taosGetCpuCores(&tsNumOfCores);
   taosGetTotalMemory(&tsTotalMemoryKB);
 
   double tmp1, tmp2, tmp3, tmp4;
-  taosGetBandSpeed(&tmp1, &tmp2);
   taosGetCpuUsage(&tmp1, &tmp2);
-  taosGetIOSpeed(&tmp1, &tmp2, &tmp3, &tmp4);
 }
 
 void taosKillSystem() {