xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

msg epset

This commit is contained in:
dmchen 2023-11-23 10:16:18 +00:00
parent 1c762011b1
commit 682ad9dd96
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/dnode/mnode/impl/src/mndCompact.c
View File

@ -19,6 +19,8 @@
#include "mndCompactDetail.h" #include "mndCompactDetail.h"
#include "mndVgroup.h" #include "mndVgroup.h"
#include "tmsgcb.h" #include "tmsgcb.h"
#include "mndDnode.h"
#include "tmisce.h"
#define MND_COMPACT_VER_NUMBER 1 #define MND_COMPACT_VER_NUMBER 1
@ -345,9 +347,13 @@ static void *mndBuildKillCompactReq(SMnode *pMnode, SVgObj *pVgroup, int32_t *pC
return pReq; return pReq;
} }
static int32_t mndAddKillCompactAction(SMnode *pMnode, STrans *pTrans, SVgObj *pVgroup, int32_t compactId) { static int32_t mndAddKillCompactAction(SMnode *pMnode, STrans *pTrans, SVgObj *pVgroup, int32_t compactId, int32_t dnodeid) {
STransAction action = {0}; STransAction action = {0};
action.epSet = mndGetVgroupEpset(pMnode, pVgroup);
SDnodeObj *pDnode = mndAcquireDnode(pMnode, dnodeid);
if (pDnode == NULL) return -1;
action.epSet = mndGetDnodeEpset(pDnode);
mndReleaseDnode(pMnode, pDnode);
int32_t contLen = 0; int32_t contLen = 0;
void *pReq = mndBuildKillCompactReq(pMnode, pVgroup, &contLen, compactId); void *pReq = mndBuildKillCompactReq(pMnode, pVgroup, &contLen, compactId);
@ -395,7 +401,7 @@ static int32_t mndKillCompact(SMnode *pMnode, SRpcMsg *pReq, SCompactObj *pCompa
return -1; return -1;
} }
if(mndAddKillCompactAction(pMnode, pTrans, pVgroup, pCompact->compactId) != 0){ if(mndAddKillCompactAction(pMnode, pTrans, pVgroup, pCompact->compactId, pDetail->dnodeId) != 0){
mError("trans:%d, failed to append redo action since %s", pTrans->id, terrstr()); mError("trans:%d, failed to append redo action since %s", pTrans->id, terrstr());
mndTransDrop(pTrans); mndTransDrop(pTrans);
return -1; return -1;
@ -512,11 +518,10 @@ void mndCompactUpdate(SMnode *pMnode, SCompactObj *pCompact){
if (pDetail->compactId == pCompact->compactId) { if (pDetail->compactId == pCompact->compactId) {
SEpSet epSet = {0}; SEpSet epSet = {0};
SVgObj *pVgroup = mndAcquireVgroup(pMnode, pDetail->vgId); SDnodeObj *pDnode = mndAcquireDnode(pMnode, pDetail->dnodeId);
if(pVgroup){ if(pDnode == NULL) break;
epSet = mndGetVgroupEpset(pMnode, pVgroup); addEpIntoEpSet(&epSet, pDnode->fqdn, pDnode->port);
mndReleaseVgroup(pMnode, pVgroup); mndReleaseDnode(pMnode, pDnode);
}
SQueryCompactProgressReq req; SQueryCompactProgressReq req;
req.compactId = pDetail->compactId; req.compactId = pDetail->compactId;