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

Merge pull request #2345 from taosdata/hotfix/rpcAssert 

Hotfix/rpc assert
This commit is contained in:
Shengliang Guan 2020-06-18 18:10:52 +08:00 committed by GitHub
parent 6d92d8376a ff16a84d59
commit 4ef4f60b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -577,10 +577,12 @@ static void rpcReleaseConn(SRpcConn *pConn) {
rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
} }
taosFreeId(pRpc->idPool, pConn->sid); // lockedBy can not be reset, since it maybe hold by a thread
int sid = pConn->sid;
int64_t lockedBy = pConn->lockedBy; int64_t lockedBy = pConn->lockedBy;
memset(pConn, 0, sizeof(SRpcConn)); memset(pConn, 0, sizeof(SRpcConn));
pConn->lockedBy = lockedBy; pConn->lockedBy = lockedBy;
taosFreeId(pRpc->idPool, sid);
tTrace("%s, rpc connection is released", pConn->info); tTrace("%s, rpc connection is released", pConn->info);
} }