This is an automated email from the ASF dual-hosted git repository.
wangbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 4d9a6027e6b [Fix]Fix FE send duplicate wg id to BE (#51703)
4d9a6027e6b is described below
commit 4d9a6027e6baa9fad9e6c6d2e5db795983cd9fc3
Author: wangbo <[email protected]>
AuthorDate: Mon Jun 16 18:38:15 2025 +0800
[Fix]Fix FE send duplicate wg id to BE (#51703)
---
be/src/runtime/workload_group/workload_group_manager.cpp | 2 +-
.../apache/doris/resource/computegroup/AllBackendComputeGroup.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/be/src/runtime/workload_group/workload_group_manager.cpp
b/be/src/runtime/workload_group/workload_group_manager.cpp
index 31a4824c9b4..6944fd2ff58 100644
--- a/be/src/runtime/workload_group/workload_group_manager.cpp
+++ b/be/src/runtime/workload_group/workload_group_manager.cpp
@@ -124,7 +124,7 @@ WorkloadGroupPtr
WorkloadGroupMgr::get_group(std::vector<uint64_t>& id_list) {
}
LOG(ERROR) << ss.str();
}
- // DCHECK(wg_cout <= 1);
+ DCHECK(wg_cout <= 1);
if (ret_wg == nullptr) {
std::shared_lock<std::shared_mutex> r_lock(_group_mutex);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/computegroup/AllBackendComputeGroup.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/computegroup/AllBackendComputeGroup.java
index 1c02b1a3d24..86f7cd4e193 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/computegroup/AllBackendComputeGroup.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/computegroup/AllBackendComputeGroup.java
@@ -27,9 +27,11 @@ import org.apache.doris.system.SystemInfoService;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import java.util.Collection;
import java.util.List;
+import java.util.Set;
public class AllBackendComputeGroup extends ComputeGroup {
@@ -70,10 +72,15 @@ public class AllBackendComputeGroup extends ComputeGroup {
if (beList.size() == 0) {
throw new RuntimeException("No backend available for Workload
Group " + wgName);
}
+ Set<String> cgSet = Sets.newHashSet();
for (Backend backend : beList) {
// in cloud mode, name is cluster id.
// in no-cloud mode, name is resource tag's name
String computeGroup = backend.getComputeGroup();
+ if (cgSet.contains(computeGroup)) {
+ continue;
+ }
+ cgSet.add(computeGroup);
WorkloadGroup wg = wgMgr.getWorkloadGroupByComputeGroup(
WorkloadGroupKey.get(computeGroup, wgName));
if (wg == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
