This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 4d3c239fa2a branch-4.0: [fix](cloud) Fix virtual compute group expand
the usage permissions o… #57516 (#57541)
4d3c239fa2a is described below
commit 4d3c239fa2a2f7db2b22c18342d6af51bad729ce
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Nov 3 12:06:22 2025 +0800
branch-4.0: [fix](cloud) Fix virtual compute group expand the usage
permissions o… #57516 (#57541)
Cherry-picked from #57516
Co-authored-by: deardeng <[email protected]>
---
.../java/org/apache/doris/cloud/system/CloudSystemInfoService.java | 4 ++--
.../src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
index 62ab6e3b9ec..de28e19dddc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
@@ -181,10 +181,10 @@ public class CloudSystemInfoService extends
SystemInfoService {
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();
}
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java
b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java
index b91030a8dd1..0807158ccdb 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/CloudAuthTest.java
@@ -367,6 +367,8 @@ public class CloudAuthTest extends TestWithFeService {
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("cg1");
policy.setStandbyComputeGroup("cg2");
@@ -380,6 +382,8 @@ public class CloudAuthTest extends TestWithFeService {
PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
Assert.assertTrue(accessManager.checkCloudPriv(new
UserIdentity("testUser", "%"), "cg2",
PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
+ Assert.assertFalse(accessManager.checkCloudPriv(new
UserIdentity("testUser", "%"), "cg",
+ PrivPredicate.USAGE, ResourceTypeEnum.CLUSTER));
ShowGrantsCommand sg = new ShowGrantsCommand(new
UserIdentity("testUser", "%"), false);
ShowResultSet showResultSet = sg.doRun(connectContext, null);
// cluster field
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
