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

refactor: node mgmt

This commit is contained in:
Shengliang Guan 2022-05-12 17:12:40 +08:00
parent 447c9504a3
commit dd87e8f7b9
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mgmt/exe/dmMain.c
View File

@ -195,8 +195,6 @@ static int32_t dmRunDnode() {
int32_t code = dmRun(pDnode); int32_t code = dmRun(pDnode);
dInfo("start shutting down the service"); dInfo("start shutting down the service");
global.pDnode = NULL;
dmClose(pDnode);
dmCleanup(); dmCleanup();
taosCloseLog(); taosCloseLog();
taosCleanupCfg(); taosCleanupCfg();

4
source/dnode/mgmt/node_mgmt/src/dmExec.c
View File

@ -203,7 +203,10 @@ void dmCloseNode(SMgmtWrapper *pWrapper) {
} }
taosWLockLatch(&pWrapper->latch); taosWLockLatch(&pWrapper->latch);
if (pWrapper->pMgmt != NULL) {
(*pWrapper->func.closeFp)(pWrapper->pMgmt); (*pWrapper->func.closeFp)(pWrapper->pMgmt);
pWrapper->pMgmt = NULL;
}
taosWUnLockLatch(&pWrapper->latch); taosWUnLockLatch(&pWrapper->latch);
if (pWrapper->procObj) { if (pWrapper->procObj) {
@ -334,6 +337,7 @@ int32_t dmRun(SDnode *pDnode) {
dmSetStatus(pDnode, DND_STAT_STOPPED); dmSetStatus(pDnode, DND_STAT_STOPPED);
dmStopNodes(pDnode); dmStopNodes(pDnode);
dmCloseNodes(pDnode); dmCloseNodes(pDnode);
dmClose(pDnode);
return 0; return 0;
} else { } else {
dmWatchNodes(pDnode); dmWatchNodes(pDnode);