database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Fix](executor)Fix normal group can not be appended when image exits #33197

Browse Source
This commit is contained in:
wangbo
2024-04-03 20:36:17 +08:00
committed by yiguolei
parent df197c6a14
commit df8e397dd8
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
View File

@ -65,6 +65,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class WorkloadGroupMgr implements Writable, GsonPostProcessable {
public static final String DEFAULT_GROUP_NAME = "normal";
public static final Long DEFAULT_GROUP_ID = 1L;
public static final ImmutableList<String> WORKLOAD_GROUP_PROC_NODE_TITLE_NAMES = new ImmutableList.Builder<String>()
.add("Id").add("Name").add(WorkloadGroup.CPU_SHARE).add(WorkloadGroup.MEMORY_LIMIT)
.add(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT)
@ -136,18 +139,26 @@ public class WorkloadGroupMgr implements Writable, GsonPostProcessable {
}
public WorkloadGroupMgr() {
Map<String, String> properties = Maps.newHashMap();
properties.put(WorkloadGroup.CPU_SHARE, "1024");
properties.put(WorkloadGroup.MEMORY_LIMIT, "30%");
properties.put(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT, "true");
WorkloadGroup defaultWorkloadGroup = new WorkloadGroup(1, DEFAULT_GROUP_NAME, properties);
nameToWorkloadGroup.put(DEFAULT_GROUP_NAME, defaultWorkloadGroup);
idToWorkloadGroup.put(defaultWorkloadGroup.getId(), defaultWorkloadGroup);
// if no fe image exist, we should append internal group here.
appendInternalWorkloadGroup();
}
public static WorkloadGroupMgr read(DataInput in) throws IOException {
String json = Text.readString(in);
return GsonUtils.GSON.fromJson(json, WorkloadGroupMgr.class);
WorkloadGroupMgr ret = GsonUtils.GSON.fromJson(json, WorkloadGroupMgr.class);
ret.appendInternalWorkloadGroup();
return ret;
}
public void appendInternalWorkloadGroup() {
Map<String, String> properties = Maps.newHashMap();
properties.put(WorkloadGroup.CPU_SHARE, "1024");
properties.put(WorkloadGroup.MEMORY_LIMIT, "30%");
properties.put(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT, "true");
WorkloadGroup defaultWorkloadGroup = new WorkloadGroup(DEFAULT_GROUP_ID.longValue(), DEFAULT_GROUP_NAME,
properties);
nameToWorkloadGroup.put(DEFAULT_GROUP_NAME, defaultWorkloadGroup);
idToWorkloadGroup.put(defaultWorkloadGroup.getId(), defaultWorkloadGroup);
}
private void readLock() {