Skip to content

enh/redefine-show-vnodes-restored #33773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanshengliang merged 4 commits into from
Dec 4, 2025
Merged

enh/redefine-show-vnodes-restored #33773

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f410c8
enh/redefine-show-vnodes-restored
cadem Dec 1, 2025
c598c30
fix: update expected values in WAL keep version tests
cadem Dec 1, 2025
dcc75cf
enh: improve vgroup readiness check by tracking leader and follower r…
cadem Dec 1, 2025
9ab1c9e
enh: rename 'restored' to 'applied' in vnode checks for consistency
cadem Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
enh: improve vgroup readiness check by tracking leader and follower r… 
…estoration states
  • Loading branch information
@cadem
cadem committed Dec 1, 2025
commit dcc75cf51bd44999850abe8e8024e450fdd778a5
11 changes: 9 additions & 2 deletions source/dnode/mnode/impl/src/mndVgroup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,8 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
}

bool isReady = false;
bool isLeaderRestored = false;
bool hasFollowerRestored = false;
// default 3 replica, add 1 replica if move vnode
for (int32_t i = 0; i < 4; ++i) {
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
Expand Down Expand Up @@ -1225,8 +1227,12 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
if (pVgroup->vnodeGid[i].syncState == TAOS_SYNC_STATE_LEADER ||
pVgroup->vnodeGid[i].syncState == TAOS_SYNC_STATE_ASSIGNED_LEADER) {
if (pVgroup->vnodeGid[i].syncRestore) {
isReady = true;
}
isLeaderRestored = true;
}
} else if (pVgroup->vnodeGid[i].syncState == TAOS_SYNC_STATE_FOLLOWER) {
if (pVgroup->vnodeGid[i].syncRestore) {
hasFollowerRestored = true;
}
}
snprintf(role, sizeof(role), "%s", syncStr(pVgroup->vnodeGid[i].syncState));
/*
Expand Down Expand Up @@ -1283,6 +1289,7 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
}
}

if (isLeaderRestored && hasFollowerRestored) isReady = true;
pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
code = colDataSetVal(pColInfo, numOfRows, (const char *)&isReady, false);
if (code != 0) {
Expand Down
Loading