diff --git a/source/dnode/mgmt/implement/src/dmExec.c b/source/dnode/mgmt/implement/src/dmExec.c index 55cf8b77ce964d16092a7a9969c9964d6517fbd0..f66e7cd9d329e8fbb7590e0bab7d17e0a54ad444 100644 --- a/source/dnode/mgmt/implement/src/dmExec.c +++ b/source/dnode/mgmt/implement/src/dmExec.c @@ -256,7 +256,7 @@ static int32_t dmStartNodes(SDnode *pDnode) { } dInfo("TDengine initialized successfully"); - dmReportStartup(pDnode, "TDengine", "initialized successfully", true); + dmReportStartup(pDnode, "TDengine", "initialized successfully"); return 0; } diff --git a/source/dnode/mgmt/interface/inc/dmDef.h b/source/dnode/mgmt/interface/inc/dmDef.h index e5749f4239c4d93af643963546d471fb74d46f57..651247ed0f40b9408371e47d9f651fff769289d2 100644 --- a/source/dnode/mgmt/interface/inc/dmDef.h +++ b/source/dnode/mgmt/interface/inc/dmDef.h @@ -133,7 +133,6 @@ typedef struct { } SDnodeData; typedef struct { - bool finished; char name[TSDB_STEP_NAME_LEN]; char desc[TSDB_STEP_DESC_LEN]; } SStartupInfo; diff --git a/source/dnode/mgmt/interface/inc/dmInt.h b/source/dnode/mgmt/interface/inc/dmInt.h index b1b3c8e70dd83dbefe03bb0df8a53bce5eefb0c6..851887de5f3f8ee3eda871db55b4d57c7f89f2cf 100644 --- a/source/dnode/mgmt/interface/inc/dmInt.h +++ b/source/dnode/mgmt/interface/inc/dmInt.h @@ -34,7 +34,7 @@ const char *dmEventName(EDndEvent ev); void dmSetStatus(SDnode *pDnode, EDndRunStatus stat); void dmSetEvent(SDnode *pDnode, EDndEvent event); void dmSetMsgHandle(SMgmtWrapper *pWrapper, tmsg_t msgType, NodeMsgFp nodeMsgFp, int8_t vgId); -void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc, bool finished); +void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc); void dmProcessServerStatusReq(SDnode *pDnode, SRpcMsg *pMsg); void dmGetMonitorSysInfo(SMonSysInfo *pInfo); diff --git a/source/dnode/mgmt/interface/src/dmInt.c b/source/dnode/mgmt/interface/src/dmInt.c index 35ffaf63b7f0402fe32168bbcb15012fabe43781..88fd5eab175bcc592d9fdb7ae2632773dbfca96f 100644 --- a/source/dnode/mgmt/interface/src/dmInt.c +++ b/source/dnode/mgmt/interface/src/dmInt.c @@ -136,16 +136,10 @@ void dmReleaseWrapper(SMgmtWrapper *pWrapper) { dTrace("node:%s, is released, refCount:%d", pWrapper->name, refCount); } -void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc, bool finished) { +void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc) { SStartupInfo *pStartup = &pDnode->startup; tstrncpy(pStartup->name, pName, TSDB_STEP_NAME_LEN); tstrncpy(pStartup->desc, pDesc, TSDB_STEP_DESC_LEN); - pStartup->finished = false; -} - -static void dmGetStartup(SDnode *pDnode, SStartupInfo *pStartup) { - memcpy(pStartup, &pDnode->startup, sizeof(SStartupInfo)); - pStartup->finished = (pDnode->status == DND_STAT_RUNNING); } static void dmGetServerStatus(SDnode *pDnode, SServerStatusRsp *pStatus) { diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 7a492fe572b6d4f16daabc71cb5d0c0604080011..a212d7edf47a3879ea7028736e1ab8e4cede7d52 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -130,7 +130,7 @@ static void *vmOpenVnodeFunc(void *param) { char stepDesc[TSDB_STEP_DESC_LEN] = {0}; snprintf(stepDesc, TSDB_STEP_DESC_LEN, "vgId:%d, start to restore, %d of %d have been opened", pCfg->vgId, pMgmt->state.openVnodes, pMgmt->state.totalVnodes); - dmReportStartup(pDnode, "open-vnodes", stepDesc, false); + dmReportStartup(pDnode, "open-vnodes", stepDesc); SMsgCb msgCb = pMgmt->pDnode->data.msgCb; msgCb.pWrapper = pMgmt->pWrapper;