From 7fadd4cb3aec7b30c99572586b3a1179f87a4838 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Tue, 1 Dec 2020 03:48:24 +0000
Subject: [PATCH] remove a potential rpcSendRecv deadlock if rpcClose is called
 by another thread

---
 src/rpc/src/rpcMain.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 4ccdec2bc7..00a97d7bc2 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -630,6 +630,7 @@ static void rpcReleaseConn(SRpcConn *pConn) {
   } else {
     // if there is an outgoing message, free it
     if (pConn->outType && pConn->pReqMsg) {
+      SRpcReqContext *pContext = pConn->pContext;
       if (pContext->pRsp) {   
         // for synchronous API, post semaphore to unblock app
         pContext->pRsp->code = TSDB_CODE_RPC_APP_ERROR;
@@ -637,8 +638,8 @@ static void rpcReleaseConn(SRpcConn *pConn) {
         pContext->pRsp->contLen = 0;
         tsem_post(pContext->pSem);
       }
-      pConn->pContext->pConn = NULL; 
-      taosRemoveRef(tsRpcRefId, pConn->pContext->rid);
+      pContext->pConn = NULL; 
+      taosRemoveRef(tsRpcRefId, pContext->rid);
     }
   }
 
-- 
GitLab