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

Merge pull request #20085 from taosdata/fix/TD-22618 

fix:pDnode is null when server init
This commit is contained in:
Xiaoyu Wang 2023-02-24 10:53:30 +08:00 committed by GitHub
parent f4885ef456 d66a0c35b2
commit 8f6f5bd2d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/dnode/mgmt/node_mgmt/src/dmTransport.c
View File

@ -93,18 +93,30 @@ static void dmProcessRpcMsg(SDnode *pDnode, SRpcMsg *pRpc, SEpSet *pEpSet) {
break; break;
} }
if (pDnode->status != DND_STAT_RUNNING) { /*
if (pRpc->msgType == TDMT_DND_SERVER_STATUS) { pDnode is null, TD-22618
dmProcessServerStartupStatus(pDnode, pRpc); at trans.c line 91
return; before this line, dmProcessRpcMsg callback is set
} else { after this line, parent is set
if (pDnode->status == DND_STAT_INIT) { so when dmProcessRpcMsg is called, pDonde is still null.
terrno = TSDB_CODE_APP_IS_STARTING; */
if (pDnode != NULL){
if(pDnode->status != DND_STAT_RUNNING) {
if (pRpc->msgType == TDMT_DND_SERVER_STATUS) {
dmProcessServerStartupStatus(pDnode, pRpc);
return;
} else { } else {
terrno = TSDB_CODE_APP_IS_STOPPING; if (pDnode->status == DND_STAT_INIT) {
terrno = TSDB_CODE_APP_IS_STARTING;
} else {
terrno = TSDB_CODE_APP_IS_STOPPING;
}
goto _OVER;
} }
goto _OVER;
} }
} else {
terrno = TSDB_CODE_APP_IS_STARTING;
goto _OVER;
} }
if (pRpc->pCont == NULL && (IsReq(pRpc) || pRpc->contLen != 0)) { if (pRpc->pCont == NULL && (IsReq(pRpc) || pRpc->contLen != 0)) {