From a04ba6581713e78664673e20e0a50cc6c1723418 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 19 Jul 2023 15:30:14 +0800
Subject: [PATCH] chore: more code

---
 include/common/tglobal.h                    | 4 ++++
 source/common/src/tglobal.c                 | 4 ++++
 source/dnode/mgmt/exe/dmMain.c              | 1 +
 source/dnode/mgmt/mgmt_dnode/src/dmWorker.c | 4 ++++
 source/dnode/mnode/impl/src/mndMain.c       | 4 +++-
 source/libs/catalog/src/ctgCache.c          | 6 ------
 source/libs/catalog/src/ctgUtil.c           | 6 ++++++
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index d6c552b3f6..a2ec4d2c03 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -87,6 +87,10 @@ extern int64_t tsMndLogRetention;
 extern int8_t  tsGrant;
 extern bool    tsMndSkipGrant;
 
+// dnode
+extern int64_t tsDndStart;
+extern int64_t tsDndUpTime;
+
 // monitor
 extern bool     tsEnableMonitor;
 extern int32_t  tsMonitorInterval;
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 611a273353..3547ecca01 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -79,6 +79,10 @@ int64_t tsMndLogRetention = 2000;
 int8_t  tsGrant = 1;
 bool    tsMndSkipGrant = false;
 
+// dnode
+int64_t tsDndStart = 0;
+int64_t tsDndUpTime = 0;
+
 // monitor
 bool     tsEnableMonitor = true;
 int32_t  tsMonitorInterval = 30;
diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
index e1b8a57684..242dd8a706 100644
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -373,6 +373,7 @@ int mainWindows(int argc, char **argv) {
 
   dInfo("start to init service");
   dmSetSignalHandle();
+  tsDndStart = taosGetTimestampMs();
   int32_t code = dmRun();
   dInfo("shutting down the service");
 
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
index 89c394fdd0..3fe943267c 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
@@ -29,6 +29,7 @@ static void *dmStatusThreadFp(void *param) {
     if (pMgmt->pData->dropped || pMgmt->pData->stopped) break;
 
     int64_t curTime = taosGetTimestampMs();
+    int64_t cost = 0;
     float   interval = (curTime - lastTime) / 1000.0f;
     if (interval >= tsStatusInterval) {
       dmSendStatusReq(pMgmt);
@@ -38,7 +39,10 @@ static void *dmStatusThreadFp(void *param) {
       if (trimCount == 0) {
         taosMemoryTrim(0);
       }
+      cost = taosGetTimestampMs() - curTime;
     }
+    tsDndUpTime += 200;
+    if (cost > 0) tsDndUpTime += cost;
   }
 
   return NULL;
diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c
index f0c53c7473..6a7bdd6df2 100644
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -156,6 +156,7 @@ static void mndPullupTelem(SMnode *pMnode) {
 
 static void mndPullupGrant(SMnode *pMnode) {
   mTrace("pullup grant msg");
+  printf("%s:%d @@@@@@@@@@@ mndPullupGrant @@@@@@@@@@@ %d \n", __func__, __LINE__, taosGetTimestampSec());
   int32_t contLen = 0;
   void   *pReq = mndBuildTimerMsg(&contLen);
   if (pReq != NULL) {
@@ -248,8 +249,9 @@ static void *mndThreadFp(void *param) {
   setThreadName("mnode-timer");
 
   while (1) {
+    printf("%s:%d =========== mndThreadFp =========== %d\n", __func__, __LINE__, taosGetTimestampSec());
     lastTime++;
-    taosMsleep(100);
+    taosMsleep(300);
     if (mndGetStop(pMnode)) break;
     if (lastTime % 10 != 0) continue;
 
diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index 605f5efeb4..44de83b7ef 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -773,12 +773,6 @@ int32_t ctgGetCachedStbNameFromSuid(SCatalog* pCtg, char* dbFName, uint64_t suid
 
 int32_t ctgChkAuthFromCache(SCatalog *pCtg, SUserAuthInfo *pReq, bool *inCache, SCtgAuthRsp *pRes) {
   int32_t code = 0;
-  if (IS_SYS_DBNAME(pReq->tbName.dbname)) {
-    *inCache = true;
-    pRes->pRawRes->pass = true;
-    ctgDebug("sysdb %s, pass", pReq->tbName.dbname);
-    return TSDB_CODE_SUCCESS;
-  }
 
   SCtgUserAuth *pUser = (SCtgUserAuth *)taosHashGet(pCtg->userCache, pReq->user, strlen(pReq->user));
   if (NULL == pUser) {
diff --git a/source/libs/catalog/src/ctgUtil.c b/source/libs/catalog/src/ctgUtil.c
index 86f6a51d9b..dab007aa47 100644
--- a/source/libs/catalog/src/ctgUtil.c
+++ b/source/libs/catalog/src/ctgUtil.c
@@ -1589,6 +1589,12 @@ int32_t ctgChkSetAuthRes(SCatalog* pCtg, SCtgAuthReq* req, SCtgAuthRsp* res) {
     return TSDB_CODE_SUCCESS;
   }
 
+  if (IS_SYS_DBNAME(pReq->tbName.dbname)) {
+    pRes->pass = true;
+    ctgDebug("sysdb %s, pass", pReq->tbName.dbname);
+    return TSDB_CODE_SUCCESS;
+  }
+
   char dbFName[TSDB_DB_FNAME_LEN];
   tNameGetFullDbName(&pReq->tbName, dbFName);