From 22f0d9b793b47773bb747755c67307fb538abfb5 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sun, 29 Sep 2024 08:24:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into
 enh/opt-transport

---
 source/libs/transport/src/transCli.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 80f6e80c73..4599a2d6f3 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1238,6 +1238,7 @@ bool cliConnMayAddUserInfo(SCliConn* pConn, STransMsgHead** ppHead, int32_t* msg
   return true;
 }
 int32_t cliBatchSend(SCliConn* pConn) {
+  int32_t   code = 0;
   SCliThrd* pThrd = pConn->hostThrd;
   STrans*   pInst = pThrd->pInst;
 
@@ -1257,10 +1258,12 @@ int32_t cliBatchSend(SCliConn* pConn) {
   }
   uv_buf_t* wb = NULL;
   if (pConn->bufSize < size) {
-    pConn->buf = taosMemoryRealloc(pConn->buf, size * sizeof(uv_buf_t));
+    uv_buf_t* twb = (uv_buf_t*)taosMemoryRealloc(pConn->buf, size * sizeof(uv_buf_t));
+    if (twb == NULL) {
+      return TSDB_CODE_OUT_OF_MEMORY;
+    }
+    pConn->buf = twb;
     pConn->bufSize = size;
-    taosMemoryFree(wb);
-    return TSDB_CODE_OUT_OF_MEMORY;
   }
 
   wb = pConn->buf;
@@ -1275,6 +1278,9 @@ int32_t cliBatchSend(SCliConn* pConn) {
     STransMsg* pReq = (STransMsg*)(&pCliMsg->msg);
     if (pReq->pCont == 0) {
       pReq->pCont = (void*)rpcMallocCont(0);
+      if (pReq->pCont == NULL) {
+        return TSDB_CODE_OUT_OF_MEMORY;
+      }
       pReq->contLen = 0;
     }
 
@@ -1327,17 +1333,16 @@ int32_t cliBatchSend(SCliConn* pConn) {
   if (ret != 0) {
     tError("%s conn %p failed to send msg, reason:%s", CONN_GET_INST_LABEL(pConn), pConn, uv_err_name(ret));
     freeWReqToWQ(&pConn->wq, req->data);
+    code = TSDB_CODE_THIRDPARTY_ERROR;
     TAOS_UNUSED(transUnrefCliHandle(pConn));
   }
-  return 0;
+  return code;
 }
 
 int32_t cliSendReq(SCliConn* pConn, SCliReq* pCliMsg) {
-  int32_t code = 0;
   transQueuePush(&pConn->reqsToSend, &pCliMsg->q);
 
-  code = cliBatchSend(pConn);
-  return code;
+  return cliBatchSend(pConn);
 }
 
 static void cliDestroyBatch(SCliBatch* pBatch) {
@@ -1786,6 +1791,10 @@ void cliHandleBatchReq(SCliThrd* pThrd, SCliReq* pReq) {
     code = cliHandleState_mayUpdateState(pConn, pReq);
   }
   code = cliSendReq(pConn, pReq);
+  if (code != 0) {
+    tWarn("%s conn %p failed to send req since %s", pInst->label, pConn, tstrerror(code));
+    TAOS_UNUSED(transUnrefCliHandle(pConn));
+  }
 
   tTrace("%s conn %p ready", pInst->label, pConn);
   return;