diff --git a/src/dnode/src/dnodeVMgmt.c b/src/dnode/src/dnodeVMgmt.c index d270ca7ea954f5f05a006b2e9f86392a19c3a652..c5f7f2add39e62e6846aba0f38ae797f6fc796ee 100644 --- a/src/dnode/src/dnodeVMgmt.c +++ b/src/dnode/src/dnodeVMgmt.c @@ -194,7 +194,7 @@ static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *rpcMsg) { SCompactVnodeMsg *pCompactVnode = rpcMsg->pCont; pCompactVnode->vgId = htonl(pCompactVnode->vgId); //do nothing - dDebug("trige compact at vgid: %d", pCompactVnode->vgId); + dDebug("trigger compact at vgid: %d", pCompactVnode->vgId); return TSDB_CODE_SUCCESS; } diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c index 666de968548592f13183c4fa2834190129090026..b61c18f495c7dbf760dd3e09345fac2426b92db9 100644 --- a/src/mnode/src/mnodeVgroup.c +++ b/src/mnode/src/mnodeVgroup.c @@ -993,11 +993,11 @@ static void mnodeSendSyncVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { dnodeSendMsgToDnode(epSet, &rpcMsg); } static void mnodeSendCompactVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { - SSyncVnodeMsg *pSyncVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); + SCompactVnodeMsg *pCompactVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); SRpcMsg rpcMsg = { .ahandle = NULL, - .pCont = pSyncVnode, - .contLen = pSyncVnode ? sizeof(SCompactVnodeMsg) : 0, + .pCont = pCompactVnode, + .contLen = pCompactVnode ? sizeof(SCompactVnodeMsg) : 0, .code = 0, .msgType = TSDB_MSG_TYPE_MD_COMPACT_VNODE }; @@ -1020,7 +1020,7 @@ void mnodeSendSyncVgroupMsg(SVgObj *pVgroup) { void mnodeSendCompactVgroupMsg(SVgObj *pVgroup) { mDebug("vgId:%d, send compact all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes, pVgroup->dbName); for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { - if (pVgroup->vnodeGid[i].role != TAOS_SYNC_ROLE_SLAVE) continue; //TODO(yihaoDeng): compact slave or not ? + //if (pVgroup->vnodeGid[i].role != TAOS_SYNC_ROLE_SLAVE) continue; //TODO(yihaoDeng): compact slave or not ? SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); mDebug("vgId:%d, index:%d, send compact vnode msg to dnode %s", pVgroup->vgId, i, pVgroup->vnodeGid[i].pDnode->dnodeEp);