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 18:23:58 +08:00
parent 1bf35e9e13
commit ffe27bc181
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/mgmt/mgmt_vnode/src/vmInt.c
View File

@ -272,8 +272,8 @@ static int32_t vmInit(const SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
tstrncpy(dCfg.dir, pInput->dataDir, TSDB_FILENAME_LEN); tstrncpy(dCfg.dir, pInput->dataDir, TSDB_FILENAME_LEN);
dCfg.level = 0; dCfg.level = 0;
dCfg.primary = 1; dCfg.primary = 1;
SDiskCfg *pDisks = tsDiskCfg; SDiskCfg *pDisks = pInput->disks;
int32_t numOfDisks = tsDiskCfgNum; int32_t numOfDisks = pInput->numOfDisks;
if (numOfDisks <= 0 || pDisks == NULL) { if (numOfDisks <= 0 || pDisks == NULL) {
pDisks = &dCfg; pDisks = &dCfg;
numOfDisks = 1; numOfDisks = 1;

6
source/dnode/mgmt/node_common/inc/dmInt.h
View File

@ -87,12 +87,14 @@ typedef struct {
SMsgCb msgCb; SMsgCb msgCb;
int32_t dnodeId; int32_t dnodeId;
int64_t clusterId; int64_t clusterId;
const char *dataDir;
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;
SDiskCfg *disks;
const char *dataDir;
} SMgmtInputOpt; } SMgmtInputOpt;
typedef struct { typedef struct {
@ -133,7 +135,7 @@ const char *dmNodeLogName(EDndNodeType ntype);
const char *dmNodeProcName(EDndNodeType ntype); const char *dmNodeProcName(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, NodeMsgFp nodeMsgFp, bool needCheckVgId); void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId);
void dmGetSystemInfo(SMonSysInfo *pInfo); void dmGetSystemInfo(SMonSysInfo *pInfo);
// dmFile.c // dmFile.c

4
source/dnode/mgmt/node_common/src/dmUtil.c
View File

@ -92,10 +92,10 @@ const char *dmProcStr(EDndProcType etype) {
} }
} }
void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, NodeMsgFp nodeMsgFp, bool needCheckVgId) { void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId) {
SMgmtHandle handle = { SMgmtHandle handle = {
.msgType = msgType, .msgType = msgType,
.msgFp = nodeMsgFp, .msgFp = (NodeMsgFp)nodeMsgFp,
.needCheckVgId = needCheckVgId, .needCheckVgId = needCheckVgId,
}; };