From da484b7ab53922d86ebec79df948f0faae331581 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 16 Jul 2022 16:28:58 +0800
Subject: [PATCH] fix(query): rpc add context len

---
 src/client/src/tscServer.c |  2 +-
 src/rpc/src/rpcMain.c      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index de57f62fbe..435a6d7214 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -376,7 +376,7 @@ void tscProcessActivityTimer(void *handle, void *tmrId) {
 
   // check queries already death
   static int activetyTimerCnt = 0;
-  if (++activetyTimerCnt > 5) { // 1.5s * 10 = 15s interval call
+  if (++activetyTimerCnt > 3) { // 1.5s * 10 = 15s interval call
     activetyTimerCnt = 0;
 
     // call check if have query doing
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index a8cd533e36..c4c2232e6b 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -1710,7 +1710,7 @@ bool doRpcSendProbe(SRpcConn *pConn) {
   memcpy(pHead->user, pConn->user, tListLen(pHead->user));
   pHead->code = htonl(code);
 
-  bool ret = rpcSendMsgToPeer(pConn, msg, sizeof(SRpcHead));
+  bool ret = rpcSendMsgToPeer(pConn, msg, sizeof(SRpcHead) + sizeof(int32_t));
   pConn->secured = 1; // connection shall be secured
 
   return ret;
@@ -1778,13 +1778,17 @@ bool rpcSaveSendInfo(int64_t rpcRid, void** ppContext, void** ppConn, void** ppF
     return false;
   }
 
+  if (pContext->pConn == NULL || pContext->pConn->chandle == NULL) {
+    return false;
+  }
+
   if (ppContext)
     *ppContext = pContext;
   if (ppConn)
     *ppConn    = pContext->pConn;
-  if (ppFdObj && pContext->pConn)
+  if (ppFdObj)
     *ppFdObj   = pContext->pConn->chandle;
-  if (pFd && pContext->pConn && pContext->pConn->chandle)
+  if (pFd)
     *pFd       = taosGetFdID(pContext->pConn->chandle);
 
   taosReleaseRef(tsRpcRefId, rpcRid);
-- 
GitLab