Skip to content

branch-3.1: [fix](cloud) Fix virtual compute group expand the usage permissions o… #57516 #58233

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

Open
wants to merge 2 commits into
base: branch-3.1
Choose a base branch
from
Open

branch-3.1: [fix](cloud) Fix virtual compute group expand the usage permissions o… #57516 #58233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cbeac6
[fix](cloud) Fix virtual compute group expand the usage permissions o…
deardeng Oct 31, 2025
4e55a8b
fix compile err
deardeng Nov 21, 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
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ public String ownedByVirtualComputeGroup(String computeGroupName) {
if (computeGroupName.equals(vcg.getPolicy().getActiveComputeGroup())) {
return vcg.getName();
}
if (vcg.getPolicy().getStandbyComputeGroup().contains(computeGroupName)) {
if (vcg.getPolicy().getStandbyComputeGroup().equals(computeGroupName)) {
return vcg.getName();
}
if (vcg.getSubComputeGroups().contains(computeGroupName)) {
if (vcg.getSubComputeGroups().stream().anyMatch(subCgName -> subCgName.equals(computeGroupName))) {
return vcg.getName();
}
}
Expand Down
10 changes: 7 additions & 3 deletions fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,11 @@ public void testVirtualComputeGroup() throws UserException {
Assert.fail();
}
// create vcg, sub cg(cg1, cg2), add to systemInfoService
ComputeGroup vcg = new ComputeGroup("vcg_id", virtualComputeGroup, ComputeGroup.ComputeTypeEnum.VIRTUAL);
vcg.setSubComputeGroups(Lists.newArrayList(computeGroup2, computeGroup1));
systemInfoService.addComputeGroup(virtualComputeGroup, vcg);
ComputeGroup vcg = new ComputeGroup("vcg_id", "vcg", ComputeGroup.ComputeTypeEnum.VIRTUAL);
vcg.setSubComputeGroups(Lists.newArrayList("cg2", "cg1"));
systemInfoService.addComputeGroup("vcg_id", vcg);
ComputeGroup cg = new ComputeGroup("vcg_id", "vcg", ComputeGroup.ComputeTypeEnum.COMPUTE);
systemInfoService.addComputeGroup("cg", cg);
ComputeGroup.Policy policy = new ComputeGroup.Policy();
policy.setActiveComputeGroup(computeGroup1);
policy.setStandbyComputeGroup(computeGroup2);
Expand All @@ -495,6 +497,8 @@ public void testVirtualComputeGroup() throws UserException {
PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
Assert.assertTrue(accessManager.checkCloudPriv(userIdentity, computeGroup2,
PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
Assert.assertFalse(accessManager.checkCloudPriv(new UserIdentity("testUser", "%"), "cg",
PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
ShowResultSet showResultSet = testShowGrants(userIdentity);
// cluster field
Assert.assertEquals("vcg: Cluster_usage_priv", showResultSet.getResultRows().get(0).get(10));
Expand Down