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

shm

This commit is contained in:
Shengliang Guan 2022-03-15 20:47:26 +08:00
parent db970c79a8
commit bde9b43933
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/mgmt/container/src/dndInt.c
View File

@ -60,6 +60,7 @@ void dndCleanup() {
monCleanup(); monCleanup();
rpcCleanup(); rpcCleanup();
walCleanUp();
taosStopCacheRefreshWorker(); taosStopCacheRefreshWorker();
dInfo("dnode env is cleaned up"); dInfo("dnode env is cleaned up");
} }

7
source/dnode/mgmt/mnode/src/mmInt.c
View File

@ -49,6 +49,12 @@ void mmRelease(SMnodeMgmt *pMgmt, SMnode *pMnode) {
} }
int32_t mmOpen(SMnodeMgmt *pMgmt, SMnodeOpt *pOption) { int32_t mmOpen(SMnodeMgmt *pMgmt, SMnodeOpt *pOption) {
if (walInit() != 0) {
dError("failed to init wal since %s", terrstr());
dndCleanup();
return -1;
}
SMnode *pMnode = mndOpen(pMgmt->path, pOption); SMnode *pMnode = mndOpen(pMgmt->path, pOption);
if (pMnode == NULL) { if (pMnode == NULL) {
dError("failed to open mnode since %s", terrstr()); dError("failed to open mnode since %s", terrstr());
@ -240,6 +246,7 @@ static int32_t mmInit(SMgmtWrapper *pWrapper) {
_OVER: _OVER:
if (code == 0) { if (code == 0) {
pWrapper->pMgmt = pMgmt;
dInfo("mnode-mgmt is initialized"); dInfo("mnode-mgmt is initialized");
} else { } else {
dError("failed to init mnode-mgmtsince %s", terrstr()); dError("failed to init mnode-mgmtsince %s", terrstr());

9
source/dnode/mgmt/mnode/src/mmWorker.c
View File

@ -94,15 +94,18 @@ static int32_t mmPutMsgToWorker(SMnodeMgmt *pMgmt, SDnodeWorker *pWorker, SNodeM
return code; return code;
} }
int32_t mmProcessWriteMsg(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { int32_t mmProcessWriteMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
SMnodeMgmt *pMgmt = pWrapper->pMgmt;
return mmPutMsgToWorker(pMgmt, &pMgmt->writeWorker, pMsg); return mmPutMsgToWorker(pMgmt, &pMgmt->writeWorker, pMsg);
} }
int32_t mmProcessSyncMsg(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { int32_t mmProcessSyncMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
SMnodeMgmt *pMgmt = pWrapper->pMgmt;
return mmPutMsgToWorker(pMgmt, &pMgmt->syncWorker, pMsg); return mmPutMsgToWorker(pMgmt, &pMgmt->syncWorker, pMsg);
} }
int32_t mmProcessReadMsg(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { int32_t mmProcessReadMsg(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) {
SMnodeMgmt *pMgmt = pWrapper->pMgmt;
return mmPutMsgToWorker(pMgmt, &pMgmt->readWorker, pMsg); return mmPutMsgToWorker(pMgmt, &pMgmt->readWorker, pMsg);
} }

12
source/dnode/mgmt/vnode/src/vmInt.c
View File

@ -35,6 +35,11 @@ static int32_t vmInit(SMgmtWrapper *pWrapper) {
// dError("failed to init tfs since %s", terrstr()); // dError("failed to init tfs since %s", terrstr());
// return -1; // return -1;
// } // }
if (walInit() != 0) {
dError("failed to init wal since %s", terrstr());
dndCleanup();
return -1;
}
SVnodeOpt vnodeOpt = {0}; SVnodeOpt vnodeOpt = {0};
vnodeOpt.nthreads = tsNumOfCommitThreads; vnodeOpt.nthreads = tsNumOfCommitThreads;
@ -46,17 +51,10 @@ static int32_t vmInit(SMgmtWrapper *pWrapper) {
return -1; return -1;
} }
if (walInit() != 0) {
dError("failed to init wal since %s", terrstr());
dndCleanup();
return -1;
}
return 0; return 0;
} }
static void vmCleanup(SMgmtWrapper *pWrapper) { static void vmCleanup(SMgmtWrapper *pWrapper) {
walCleanUp();
vnodeCleanup(); vnodeCleanup();
} }