From 66e5062b09f8e6fcc269e07d4680461c02ac1404 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 2 Nov 2021 14:25:30 +0800
Subject: [PATCH] [TD-6452]<feature>: taoskeeper add request metrics

---
 src/plugins/monitor/src/monMain.c | 2 +-
 src/vnode/src/vnodeWrite.c        | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/monitor/src/monMain.c b/src/plugins/monitor/src/monMain.c
index 932724a2c5..8830c47e14 100644
--- a/src/plugins/monitor/src/monMain.c
+++ b/src/plugins/monitor/src/monMain.c
@@ -200,7 +200,6 @@ static void *monThreadFunc(void *param) {
 
     if (tsMonitor.state == MON_STATE_INITED) {
       if (accessTimes % tsMonitorInterval == 0 || accessTimes == 1) {
-        monSaveSystemInfo();
         monSaveDnodesInfo();
         if (monHasMnodeMaster) {
           //only mnode master will write cluster info
@@ -210,6 +209,7 @@ static void *monThreadFunc(void *param) {
         monSaveSlowQueryInfo();
         monSaveDisksInfo();
         monSaveGrantsInfo();
+        monSaveSystemInfo();
       }
     }
   }
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index ef0281277a..c76298ae11 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -170,10 +170,13 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
   if (tsdbInsertData(pVnode->tsdb, pCont, pRsp) < 0) {
     code = terrno;
   } else {
-    atomic_fetch_add_32(&tsSubmitReqSucNum, 1);
+    if (pRsp != NULL) atomic_fetch_add_32(&tsSubmitReqSucNum, 1);
+  }
+
+  if (pRsp) {
+    atomic_fetch_add_32(&tsSubmitRowNum, ntohl(pRsp->numOfRows));
+    atomic_fetch_add_32(&tsSubmitRowSucNum, ntohl(pRsp->affectedRows));
   }
-  atomic_fetch_add_32(&tsSubmitRowNum, ntohl(pRsp->numOfRows));
-  atomic_fetch_add_32(&tsSubmitRowSucNum, ntohl(pRsp->affectedRows));
 
   return code;
 }
-- 
GitLab