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

[TD-93] fix deadlocks in dnode

This commit is contained in:
slguan 2020-04-05 18:40:18 +08:00
parent fb56f9dce7
commit 9fa0685a24
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mnode/src/mgmtDnode.c
View File

@ -182,7 +182,7 @@ void mgmtProcessCfgDnodeMsg(SQueuedMsg *pMsg) {
} }
static void mgmtProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) { static void mgmtProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) {
mPrint("cfg vnode rsp is received"); mPrint("cfg vnode rsp is received, result:%s", tstrerror(rpcMsg->code));
} }
void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {

2
src/util/src/tglobalcfg.c
View File

@ -995,7 +995,7 @@ int tsCfgDynamicOptions(char *msg) {
int vint = 0; int vint = 0;
paGetToken(msg, &option, &olen); paGetToken(msg, &option, &olen);
if (olen == 0) return code; if (olen == 0) return TSDB_CODE_INVALID_MSG_CONTENT;
paGetToken(option + olen + 1, &value, &vlen); paGetToken(option + olen + 1, &value, &vlen);
if (vlen == 0) if (vlen == 0)

7
src/vnode/main/src/vnodeMain.c
View File

@ -232,8 +232,11 @@ static void vnodeBuildVloadMsg(char *pNode, void * param) {
} }
static void vnodeCleanUp(SVnodeObj *pVnode) { static void vnodeCleanUp(SVnodeObj *pVnode) {
taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId); if (pVnode->status == VN_STATUS_DELETING) {
// fix deadlock occured while close system
taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
}
//syncStop(pVnode->sync); //syncStop(pVnode->sync);
tsdbCloseRepo(pVnode->tsdb); tsdbCloseRepo(pVnode->tsdb);
walClose(pVnode->wal); walClose(pVnode->wal);