Skip to content

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

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

Merged
yiguolei merged 1 commit into from
Apr 3, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 17 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
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)
Expand Down Expand Up @@ -137,20 +140,28 @@ public void resetQueryQueueProp() {
}

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();
}
Expand Down