This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new df8e397dd87 [Fix](executor)Fix normal group can not be appended when
image exits #33197
df8e397dd87 is described below
commit df8e397dd875043178b0902748cd009505702b01
Author: wangbo <[email protected]>
AuthorDate: Wed Apr 3 20:36:17 2024 +0800
[Fix](executor)Fix normal group can not be appended when image exits #33197
---
.../resource/workloadgroup/WorkloadGroupMgr.java | 23 ++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
index 08de0ce338a..4a2aee7cfda 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
@@ -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,20 +139,28 @@ public class WorkloadGroupMgr implements Writable,
GsonPostProcessable {
}
public WorkloadGroupMgr() {
+ // 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);
+ 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(1,
DEFAULT_GROUP_NAME, properties);
+ WorkloadGroup defaultWorkloadGroup = new
WorkloadGroup(DEFAULT_GROUP_ID.longValue(), DEFAULT_GROUP_NAME,
+ properties);
nameToWorkloadGroup.put(DEFAULT_GROUP_NAME, defaultWorkloadGroup);
idToWorkloadGroup.put(defaultWorkloadGroup.getId(),
defaultWorkloadGroup);
}
- public static WorkloadGroupMgr read(DataInput in) throws IOException {
- String json = Text.readString(in);
- return GsonUtils.GSON.fromJson(json, WorkloadGroupMgr.class);
- }
-
private void readLock() {
lock.readLock().lock();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
