xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove a potential rpcSendRecv deadlock if rpcClose is called by another thread

This commit is contained in:
Jeff Tao 2020-12-01 03:48:24 +00:00
parent 4e0f1055dc
commit 7fadd4cb3a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/rpc/src/rpcMain.c
View File

@ -630,6 +630,7 @@ static void rpcReleaseConn(SRpcConn *pConn) {
} else { } else {
// if there is an outgoing message, free it // if there is an outgoing message, free it
if (pConn->outType && pConn->pReqMsg) { if (pConn->outType && pConn->pReqMsg) {
SRpcReqContext *pContext = pConn->pContext;
if (pContext->pRsp) { if (pContext->pRsp) {
// for synchronous API, post semaphore to unblock app // for synchronous API, post semaphore to unblock app
pContext->pRsp->code = TSDB_CODE_RPC_APP_ERROR; pContext->pRsp->code = TSDB_CODE_RPC_APP_ERROR;
@ -637,8 +638,8 @@ static void rpcReleaseConn(SRpcConn *pConn) {
pContext->pRsp->contLen = 0; pContext->pRsp->contLen = 0;
tsem_post(pContext->pSem); tsem_post(pContext->pSem);
} }
pConn->pContext->pConn = NULL; pContext->pConn = NULL;
taosRemoveRef(tsRpcRefId, pConn->pContext->rid); taosRemoveRef(tsRpcRefId, pContext->rid);
} }
} }