From 7ff25d68953a7ac6b92e060a8dadf4fbbcdd9306 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Thu, 20 Jul 2023 10:56:08 +0800
Subject: [PATCH] chore: more code

---
 source/common/src/tglobal.c                 | 1 +
 source/dnode/mgmt/mgmt_dnode/src/dmWorker.c | 2 +-
 source/dnode/mnode/impl/inc/mndCluster.h    | 2 +-
 source/dnode/mnode/impl/src/mndCluster.c    | 4 ++--
 source/dnode/mnode/impl/src/mndMain.c       | 5 ++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 3547ecca01..ba05b2b2f4 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -81,6 +81,7 @@ bool    tsMndSkipGrant = false;
 
 // dnode
 int64_t tsDndStart = 0;
+int64_t tsDndStartOsUptime = 0;
 int64_t tsDndUpTime = 0;
 
 // monitor
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
index 3fe943267c..55fdd0f46a 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
@@ -42,7 +42,7 @@ static void *dmStatusThreadFp(void *param) {
       cost = taosGetTimestampMs() - curTime;
     }
     tsDndUpTime += 200;
-    if (cost > 0) tsDndUpTime += cost;
+    if (cost > 0) tsDndUpTime += cost; // TODO: use /proc/uptime to replace the upTime calculation for linux
   }
 
   return NULL;
diff --git a/source/dnode/mnode/impl/inc/mndCluster.h b/source/dnode/mnode/impl/inc/mndCluster.h
index 2cb41edd7c..e33ffdb372 100644
--- a/source/dnode/mnode/impl/inc/mndCluster.h
+++ b/source/dnode/mnode/impl/inc/mndCluster.h
@@ -27,7 +27,7 @@ void    mndCleanupCluster(SMnode *pMnode);
 int32_t mndGetClusterName(SMnode *pMnode, char *clusterName, int32_t len);
 int64_t mndGetClusterId(SMnode *pMnode);
 int64_t mndGetClusterCreateTime(SMnode *pMnode);
-float   mndGetClusterUpTime(SMnode *pMnode);
+int64_t mndGetClusterUpTime(SMnode *pMnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/dnode/mnode/impl/src/mndCluster.c b/source/dnode/mnode/impl/src/mndCluster.c
index c5cac21d00..d20350b094 100644
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
@@ -123,7 +123,7 @@ static int32_t mndGetClusterUpTimeImp(SClusterObj *pCluster) {
 #endif
 }
 
-float mndGetClusterUpTime(SMnode *pMnode) {
+int64_t mndGetClusterUpTime(SMnode *pMnode) {
   int64_t      upTime = 0;
   void        *pIter = NULL;
   SClusterObj *pCluster = mndAcquireCluster(pMnode, &pIter);
@@ -132,7 +132,7 @@ float mndGetClusterUpTime(SMnode *pMnode) {
     mndReleaseCluster(pMnode, pCluster, pIter);
   }
 
-  return (float)upTime;
+  return upTime;
 }
 
 static SSdbRaw *mndClusterActionEncode(SClusterObj *pCluster) {
diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c
index 6a7bdd6df2..5db9384f5a 100644
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -249,9 +249,8 @@ static void *mndThreadFp(void *param) {
   setThreadName("mnode-timer");
 
   while (1) {
-    printf("%s:%d =========== mndThreadFp =========== %d\n", __func__, __LINE__, taosGetTimestampSec());
     lastTime++;
-    taosMsleep(300);
+    taosMsleep(100);
     if (mndGetStop(pMnode)) break;
     if (lastTime % 10 != 0) continue;
 
@@ -806,7 +805,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
     if (pObj->id == pMnode->selfDnodeId) {
       pClusterInfo->first_ep_dnode_id = pObj->id;
       tstrncpy(pClusterInfo->first_ep, pObj->pDnode->ep, sizeof(pClusterInfo->first_ep));
-      pClusterInfo->master_uptime = mndGetClusterUpTime(pMnode) / 86400.0f;
+      pClusterInfo->master_uptime = (float)mndGetClusterUpTime(pMnode) / 86400.0f;
       // pClusterInfo->master_uptime = (ms - pObj->stateStartTime) / (86400000.0f);
       tstrncpy(desc.role, syncStr(TAOS_SYNC_STATE_LEADER), sizeof(desc.role));
     } else {