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

fix: arb send set assigned req

This commit is contained in:
Shungang Li 2024-03-22 12:59:07 +08:00
parent be54767897
commit 2821e706a5
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/dnode/mnode/impl/src/mndArbGroup.c
View File

@ -537,15 +537,25 @@ static int32_t mndProcessArbCheckSyncTimer(SRpcMsg *pReq) {
bool member0IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 0, nowMs); bool member0IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 0, nowMs);
bool member1IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 1, nowMs); bool member1IsTimeout = mndCheckArbMemberHbTimeout(&arbGroupDup, 1, nowMs);
int32_t currentAssignedDnodeId = arbGroupDup.assignedLeader.dnodeId; SArbAssignedLeader* pAssignedLeader = &arbGroupDup.assignedLeader;
int32_t currentAssignedDnodeId = pAssignedLeader->dnodeId;
// 1. both of the two members are timeout => skip // 1. has assigned && is sync => send req
if (currentAssignedDnodeId != 0 && arbGroupDup.isSync == true) {
(void)mndSendArbSetAssignedLeaderReq(pMnode, currentAssignedDnodeId, vgId, arbToken, term,
pAssignedLeader->token);
mInfo("vgId:%d, arb send set assigned leader to dnodeId:%d", vgId, currentAssignedDnodeId);
sdbRelease(pSdb, pArbGroup);
continue;
}
// 2. both of the two members are timeout => skip
if (member0IsTimeout && member1IsTimeout) { if (member0IsTimeout && member1IsTimeout) {
sdbRelease(pSdb, pArbGroup); sdbRelease(pSdb, pArbGroup);
continue; continue;
} }
// 2. no member is timeout => check sync // 3. no member is timeout => check sync
if (member0IsTimeout == false && member1IsTimeout == false) { if (member0IsTimeout == false && member1IsTimeout == false) {
// no assigned leader and not sync // no assigned leader and not sync
if (currentAssignedDnodeId == 0 && !arbGroupDup.isSync) { if (currentAssignedDnodeId == 0 && !arbGroupDup.isSync) {
@ -556,7 +566,7 @@ static int32_t mndProcessArbCheckSyncTimer(SRpcMsg *pReq) {
continue; continue;
} }
// 3. one of the members is timeout => set assigned leader // 4. one of the members is timeout => set assigned leader
int32_t candidateIndex = member0IsTimeout ? 1 : 0; int32_t candidateIndex = member0IsTimeout ? 1 : 0;
SArbGroupMember *pMember = &arbGroupDup.members[candidateIndex]; SArbGroupMember *pMember = &arbGroupDup.members[candidateIndex];
@ -581,8 +591,7 @@ static int32_t mndProcessArbCheckSyncTimer(SRpcMsg *pReq) {
continue; continue;
} }
// no assigned leader => write to sdb // is sync && no assigned leader => write to sdb
if (currentAssignedDnodeId == 0) {
SArbGroup newGroup = {0}; SArbGroup newGroup = {0};
mndArbGroupDupObj(&arbGroupDup, &newGroup); mndArbGroupDupObj(&arbGroupDup, &newGroup);
mndArbGroupSetAssignedLeader(&newGroup, candidateIndex); mndArbGroupSetAssignedLeader(&newGroup, candidateIndex);
@ -594,13 +603,6 @@ static int32_t mndProcessArbCheckSyncTimer(SRpcMsg *pReq) {
} }
mInfo("vgId:%d, arb pull up set assigned leader to dnodeId:%d", vgId, pMember->info.dnodeId); mInfo("vgId:%d, arb pull up set assigned leader to dnodeId:%d", vgId, pMember->info.dnodeId);
sdbRelease(pSdb, pArbGroup);
continue;
}
// isSync == true && dnodeId match => send request to dnode
(void)mndSendArbSetAssignedLeaderReq(pMnode, pMember->info.dnodeId, vgId, arbToken, term, pMember->state.token);
mInfo("vgId:%d, arb send set assigned leader to dnodeId:%d", vgId, pMember->info.dnodeId);
sdbRelease(pSdb, pArbGroup); sdbRelease(pSdb, pArbGroup);
} }