From be7791f9cd25b1362907b414773ce6b5daf4ff33 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Tue, 24 Oct 2023 13:58:30 +0800
Subject: [PATCH] fix: disable life extending of conn cache obj when show
 queries/conns

---
 include/util/tcache.h                    |  2 ++
 source/dnode/mnode/impl/src/mndProfile.c | 13 +++++++------
 source/util/src/tcache.c                 | 12 ++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/include/util/tcache.h b/include/util/tcache.h
index d8ab018570..474e5274de 100644
--- a/include/util/tcache.h
+++ b/include/util/tcache.h
@@ -151,6 +151,8 @@ void       *taosCacheIterGetData(const SCacheIter *pIter, size_t *dataLen);
 void       *taosCacheIterGetKey(const SCacheIter *pIter, size_t *keyLen);
 void        taosCacheDestroyIter(SCacheIter *pIter);
 
+void taosCacheTryExtendLifeSpan(SCacheObj *pCacheObj, void **data);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index 1f8c3b161b..4366053237 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -59,7 +59,7 @@ static SConnObj *mndCreateConn(SMnode *pMnode, const char *user, int8_t connType
                                int32_t pid, const char *app, int64_t startTime);
 static void      mndFreeConn(SConnObj *pConn);
 static SConnObj *mndAcquireConn(SMnode *pMnode, uint32_t connId);
-static void      mndReleaseConn(SMnode *pMnode, SConnObj *pConn);
+static void      mndReleaseConn(SMnode *pMnode, SConnObj *pConn, bool extendLifespan);
 static void     *mndGetNextConn(SMnode *pMnode, SCacheIter *pIter);
 static void      mndCancelGetNextConn(SMnode *pMnode, void *pIter);
 static int32_t   mndProcessHeartBeatReq(SRpcMsg *pReq);
@@ -79,7 +79,7 @@ int32_t mndInitProfile(SMnode *pMnode) {
 
   // in ms
   int32_t checkTime = tsShellActivityTimer * 2 * 1000;
-  pMgmt->connCache = taosCacheInit(TSDB_DATA_TYPE_UINT, checkTime, true, (__cache_free_fn_t)mndFreeConn, "conn");
+  pMgmt->connCache = taosCacheInit(TSDB_DATA_TYPE_UINT, checkTime, false, (__cache_free_fn_t)mndFreeConn, "conn");
   if (pMgmt->connCache == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     mError("failed to alloc profile cache since %s", terrstr());
@@ -185,11 +185,12 @@ static SConnObj *mndAcquireConn(SMnode *pMnode, uint32_t connId) {
   return pConn;
 }
 
-static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn) {
+static void mndReleaseConn(SMnode *pMnode, SConnObj *pConn, bool extendLifespan) {
   if (pConn == NULL) return;
   mTrace("conn:%u, released from cache, data:%p", pConn->id, pConn);
 
   SProfileMgmt *pMgmt = &pMnode->profileMgmt;
+  if (extendLifespan) taosCacheTryExtendLifeSpan(pMgmt->connCache, (void **)&pConn);
   taosCacheRelease(pMgmt->connCache, (void **)&pConn, false);
 }
 
@@ -323,7 +324,7 @@ _OVER:
 
   mndReleaseUser(pMnode, pUser);
   mndReleaseDb(pMnode, pDb);
-  mndReleaseConn(pMnode, pConn);
+  mndReleaseConn(pMnode, pConn, true);
 
   return code;
 }
@@ -485,7 +486,7 @@ static int32_t mndProcessQueryHeartBeat(SMnode *pMnode, SRpcMsg *pMsg, SClientHb
 
     SQueryHbRspBasic *rspBasic = taosMemoryCalloc(1, sizeof(SQueryHbRspBasic));
     if (rspBasic == NULL) {
-      mndReleaseConn(pMnode, pConn);
+      mndReleaseConn(pMnode, pConn, true);
       terrno = TSDB_CODE_OUT_OF_MEMORY;
       mError("user:%s, conn:%u failed to process hb while since %s", pConn->user, pBasic->connId, terrstr());
       return -1;
@@ -508,7 +509,7 @@ static int32_t mndProcessQueryHeartBeat(SMnode *pMnode, SRpcMsg *pMsg, SClientHb
 
     mndCreateQnodeList(pMnode, &rspBasic->pQnodeList, -1);
 
-    mndReleaseConn(pMnode, pConn);
+    mndReleaseConn(pMnode, pConn, true);
 
     hbRsp.query = rspBasic;
   } else {
diff --git a/source/util/src/tcache.c b/source/util/src/tcache.c
index 392ac5d8b2..11f8df4c93 100644
--- a/source/util/src/tcache.c
+++ b/source/util/src/tcache.c
@@ -997,3 +997,15 @@ void taosCacheDestroyIter(SCacheIter *pIter) {
   taosMemoryFreeClear(pIter->pCurrent);
   taosMemoryFreeClear(pIter);
 }
+
+void taosCacheTryExtendLifeSpan(SCacheObj *pCacheObj, void **data) {
+  if (!pCacheObj || !(*data)) return;
+
+  SCacheNode *pNode = (SCacheNode *)((char *)(*data) - sizeof(SCacheNode));
+  if (pNode->signature != pNode) return;
+
+  if (!pNode->inTrashcan) {
+    atomic_store_64(&pNode->expireTime, pNode->lifespan + taosGetTimestampMs());
+    uDebug("cache:%s, data:%p extend expire time: %" PRId64, pCacheObj->name, pNode->data, pNode->expireTime);
+  }
+}