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 2022-05-11 23:14:47 +08:00
parent e278a4f434
commit 7dbc1296db
3 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
source/dnode/mgmt/node_util/inc/dmUtil.h
View File

@ -81,20 +81,28 @@ typedef enum {
DND_PROC_TEST, DND_PROC_TEST,
} EDndProcType; } EDndProcType;
typedef int32_t (*ProcessCreateNodeFp)(struct SDnode *pDnode, EDndNodeType ntype, SNodeMsg *pMsg);
typedef int32_t (*ProcessDropNodeFp)(struct SDnode *pDnode, EDndNodeType ntype, SNodeMsg *pMsg);
typedef int8_t (*IsNodeDeployedFp)(struct SDnode *pDnode, EDndNodeType ntype);
typedef struct { typedef struct {
const char *path; const char *path;
const char *name; const char *name;
SMsgCb msgCb; SMsgCb msgCb;
int32_t dnodeId; int32_t dnodeId;
int64_t clusterId; int64_t clusterId;
const char *localEp; const char *localEp;
const char *firstEp; const char *firstEp;
const char *localFqdn; const char *localFqdn;
uint16_t serverPort; uint16_t serverPort;
int32_t supportVnodes; int32_t supportVnodes;
int32_t numOfDisks; int32_t numOfDisks;
SDiskCfg *disks; SDiskCfg *disks;
const char *dataDir; const char *dataDir;
struct SDnode *pDnode;
ProcessCreateNodeFp processCreateNodeFp;
ProcessDropNodeFp processDropNodeFp;
IsNodeDeployedFp isNodeDeployedFp;
} SMgmtInputOpt; } SMgmtInputOpt;
typedef struct { typedef struct {
@ -137,7 +145,7 @@ const char *dmNodeName(EDndNodeType ntype);
const char *dmEventStr(EDndEvent etype); const char *dmEventStr(EDndEvent etype);
const char *dmProcStr(EDndProcType ptype); const char *dmProcStr(EDndProcType ptype);
void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId); void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId);
void dmGetSystemInfo(SMonSysInfo *pInfo); void dmGetMonitorSystemInfo(SMonSysInfo *pInfo);
// dmFile.c // dmFile.c
int32_t dmReadFile(const char *path, const char *name, bool *pDeployed); int32_t dmReadFile(const char *path, const char *name, bool *pDeployed);
@ -146,6 +154,35 @@ TdFilePtr dmCheckRunning(const char *dataDir);
int32_t dmReadShmFile(const char *path, const char *name, SShm *pShm); int32_t dmReadShmFile(const char *path, const char *name, SShm *pShm);
int32_t dmWriteShmFile(const char *path, const char *name, const SShm *pShm); int32_t dmWriteShmFile(const char *path, const char *name, const SShm *pShm);
// common define
typedef struct {
int32_t dnodeId;
int64_t clusterId;
int64_t dnodeVer;
int64_t updateTime;
int64_t rebootTime;
int32_t unsyncedVgId;
ESyncState vndState;
ESyncState mndState;
bool isMnode;
bool dropped;
SEpSet mnodeEps;
SArray *dnodeEps;
SHashObj *dnodeHash;
SRWLatch latch;
SMsgCb msgCb;
TdFilePtr lockfile;
char *localEp;
char *localFqdn;
char *firstEp;
char *secondEp;
char *dataDir;
SDiskCfg *disks;
int32_t numOfDisks;
int32_t supportVnodes;
uint16_t serverPort;
} SDnodeData;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

11
source/dnode/mgmt/node_util/src/dmEnv.c
View File

@ -30,6 +30,16 @@ int32_t dmInit() {
taosBlockSIGPIPE(); taosBlockSIGPIPE();
taosResolveCRC(); taosResolveCRC();
SMonCfg monCfg = {0};
monCfg.maxLogs = tsMonitorMaxLogs;
monCfg.port = tsMonitorPort;
monCfg.server = tsMonitorFqdn;
monCfg.comp = tsMonitorComp;
if (monInit(&monCfg) != 0) {
dError("failed to init monitor since %s", terrstr());
return -1;
}
dInfo("env is initialized"); dInfo("env is initialized");
return 0; return 0;
} }
@ -45,6 +55,7 @@ void dmCleanup() {
syncCleanUp(); syncCleanUp();
walCleanUp(); walCleanUp();
udfcClose(); udfcClose();
udfStopUdfd();
taosStopCacheRefreshWorker(); taosStopCacheRefreshWorker();
dInfo("env is cleaned up"); dInfo("env is cleaned up");
} }

2
source/dnode/mgmt/node_util/src/dmUtil.c
View File

@ -119,7 +119,7 @@ void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool need
return taosArrayPush(pArray, &handle); return taosArrayPush(pArray, &handle);
} }
void dmGetSystemInfo(SMonSysInfo *pInfo) { void dmGetMonitorSystemInfo(SMonSysInfo *pInfo) {
taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system); taosGetCpuUsage(&pInfo->cpu_engine, &pInfo->cpu_system);
taosGetCpuCores(&pInfo->cpu_cores); taosGetCpuCores(&pInfo->cpu_cores);
taosGetProcMemory(&pInfo->mem_engine); taosGetProcMemory(&pInfo->mem_engine);