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-14 20:47:35 +08:00
parent 36086393f1
commit b574dfd7e9
3 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/dnode/mgmt/dnode/src/dmMgmt.c
View File

@ -336,6 +336,26 @@ int32_t dmInit(SMgmtWrapper *pWrapper) {
#endif #endif
} }
void dmCleanup(SMgmtWrapper *pWrapper) {} void dmCleanup(SMgmtWrapper *pWrapper) {
SDnodeMgmt *pMgmt = pWrapper->pMgmt;
if (pMgmt == NULL) return;
dmStopWorker(pMgmt);
taosWLockLatch(&pMgmt->latch);
if (pMgmt->pDnodeEps != NULL) {
taosArrayDestroy(pMgmt->pDnodeEps);
pMgmt->pDnodeEps = NULL;
}
if (pMgmt->dnodeHash != NULL) {
taosHashCleanup(pMgmt->dnodeHash);
pMgmt->dnodeHash = NULL;
}
taosWUnLockLatch(&pMgmt->latch);
dInfo("dnode-mgmt is cleaned up");
}
bool dmRequire(SMgmtWrapper *pWrapper) { return true; } bool dmRequire(SMgmtWrapper *pWrapper) { return true; }

42
source/dnode/mgmt/dnode/src/dmWorker.c
View File

@ -15,8 +15,8 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "dmWorker.h" #include "dmWorker.h"
#include "dndWorker.h"
#include "dmHandle.h" #include "dmHandle.h"
#include "dndWorker.h"
static void *dnodeThreadRoutine(void *param) { static void *dnodeThreadRoutine(void *param) {
SDnodeMgmt *pMgmt = param; SDnodeMgmt *pMgmt = param;
@ -41,11 +41,11 @@ static void *dnodeThreadRoutine(void *param) {
lastStatusTime = curTime; lastStatusTime = curTime;
} }
// float monitorInterval = (curTime - lastMonitorTime) / 1000.0f; float monitorInterval = (curTime - lastMonitorTime) / 1000.0f;
// if (monitorInterval >= tsMonitorInterval) { if (monitorInterval >= tsMonitorInterval) {
// dndSendMonitorReport(pDnode); dndSendMonitorReport(pDnode);
// lastMonitorTime = curTime; lastMonitorTime = curTime;
// } }
} }
} }
@ -137,30 +137,22 @@ int32_t dmStartWorker(SDnodeMgmt *pMgmt) {
return -1; return -1;
} }
// pMgmt->threadId = taosCreateThread(dnodeThreadRoutine, pDnode); pMgmt->threadId = taosCreateThread(dnodeThreadRoutine, pMgmt);
// if (pMgmt->threadId == NULL) { if (pMgmt->threadId == NULL) {
// dError("failed to init dnode thread"); dError("failed to init dnode thread");
// terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;
// return -1; return -1;
// } }
return 0; return 0;
} }
void dmStopWorker(SDnodeMgmt *pMgmt) { void dmStopWorker(SDnodeMgmt *pMgmt) {
#if 0 dndCleanupWorker(&pMgmt->mgmtWorker);
SMnodeMgmt *pMgmt = &pDnode->mmgmt; dndCleanupWorker(&pMgmt->statusWorker);
taosWLockLatch(&pMgmt->latch); if (pMgmt->threadId != NULL) {
pMgmt->deployed = 0; taosDestoryThread(pMgmt->threadId);
taosWUnLockLatch(&pMgmt->latch); pMgmt->threadId = NULL;
while (pMgmt->refCount > 1) {
taosMsleep(10);
} }
dndCleanupWorker(&pMgmt->readWorker);
dndCleanupWorker(&pMgmt->writeWorker);
dndCleanupWorker(&pMgmt->syncWorker);
#endif
} }

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

@ -32,3 +32,8 @@ SMgmtFp mmGetMgmtFp() {
int32_t mmGetUserAuth(SMgmtWrapper *pWrapper, char *user, char *spi, char *encrypt, char *secret, char *ckey) { int32_t mmGetUserAuth(SMgmtWrapper *pWrapper, char *user, char *spi, char *encrypt, char *secret, char *ckey) {
return 0; return 0;
} }
int32_t mmGetMonitorInfo(SDnode *pDnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo,
SMonGrantInfo *pGrantInfo) {
return 0;
}