From 3b0d3427930ce911f68c1a7433afc17aa329bf29 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 11 Oct 2024 17:24:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into
 enh/opt-transport

---
 source/libs/transport/src/transCli.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 223ed0349c..a48b29e34d 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -315,6 +315,7 @@ typedef struct {
   // void*    p;
   Heap* heap;
   int32_t (*cmpFunc)(const HeapNode* a, const HeapNode* b);
+  int64_t lastUpdateTs;
 } SHeap;
 
 int32_t compareHeapNode(const HeapNode* a, const HeapNode* b);
@@ -3742,7 +3743,7 @@ static SCliConn* getConnFromHeapCache(SHashObj* pConnHeapCache, char* key) {
     return NULL;
   } else {
     if (shouldSWitchToOtherConn(pConn, key)) {
-      if (pHeap->heap->nelts >= 16) {
+      if (pHeap->heap->nelts >= 8) {
         balanceConnHeapCache(pConnHeapCache, pConn);
       }
       logConnMissHit(pConn);
@@ -3793,7 +3794,14 @@ static int32_t delConnFromHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
 
 static int32_t balanceConnHeapCache(SHashObj* pConnHeapCache, SCliConn* pConn) {
   if (pConn->heap != NULL && pConn->inHeap != 0) {
-    return transHeapBalance(pConn->heap, pConn);
+    SHeap* heap = pConn->heap;
+    tTrace("conn %p'heap have too many conn %d, should do balance", pConn, heap->heap->nelts);
+    int64_t now = taosGetTimestampMs();
+    if (((now - heap->lastUpdateTs) / 1000) > 30) {
+      heap->lastUpdateTs = now;
+      tTrace("conn %p'heap have too many conn %d, do balance", pConn, heap->heap->nelts);
+      return transHeapBalance(pConn->heap, pConn);
+    }
   }
   return 0;
 }
@@ -3872,9 +3880,6 @@ int32_t transHeapBalance(SHeap* heap, SCliConn* p) {
   if (p->inHeap == 0 && heap == NULL || heap->heap == NULL) {
     return 0;
   }
-  if (heap->heap->nelts >= 32) {
-    tTrace("conn %p heap busy,heap size:%d", p, heap->heap->nelts);
-  }
   heapRemove(heap->heap, &p->node);
   heapInsert(heap->heap, &p->node);
   return 0;