wangbo commented on code in PR #54243:
URL: https://github.com/apache/doris/pull/54243#discussion_r2256025428
##########
fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java:
##########
@@ -94,36 +103,35 @@ public class WorkloadGroup implements Writable,
GsonPostProcessable {
// NOTE(wb): all property is not required, some properties default value
is set in be
// default value is as followed
- // cpu_share=1024, memory_limit=0%(0 means not limit),
enable_memory_overcommit=true
private static final ImmutableSet<String> ALL_PROPERTIES_NAME = new
ImmutableSet.Builder<String>()
-
.add(CPU_SHARE).add(MEMORY_LIMIT).add(ENABLE_MEMORY_OVERCOMMIT).add(MAX_CONCURRENCY)
-
.add(MAX_QUEUE_SIZE).add(QUEUE_TIMEOUT).add(CPU_HARD_LIMIT).add(SCAN_THREAD_NUM)
- .add(MAX_REMOTE_SCAN_THREAD_NUM).add(MIN_REMOTE_SCAN_THREAD_NUM)
- .add(MEMORY_LOW_WATERMARK).add(MEMORY_HIGH_WATERMARK)
+ .add(MAX_CPU_PERCENT).add(MIN_CPU_PERCENT)
+
.add(MAX_MEMORY_PERCENT).add(MIN_MEMORY_PERCENT).add(ENABLE_MEMORY_OVERCOMMIT)
+ .add(MAX_CONCURRENCY).add(MAX_QUEUE_SIZE).add(QUEUE_TIMEOUT)
+
.add(SCAN_THREAD_NUM).add(MAX_REMOTE_SCAN_THREAD_NUM).add(MIN_REMOTE_SCAN_THREAD_NUM)
+
.add(MEMORY_LOW_WATERMARK).add(MEMORY_HIGH_WATERMARK).add(WRITE_BUFFER_RATIO)
.add(COMPUTE_GROUP).add(READ_BYTES_PER_SECOND).add(REMOTE_READ_BYTES_PER_SECOND)
- .add(WRITE_BUFFER_RATIO).add(SLOT_MEMORY_POLICY).build();
+ .add(SLOT_MEMORY_POLICY).build();
private static final ImmutableMap<String, String>
DEPRECATED_PROPERTIES_NAME =
new ImmutableMap.Builder<String, String>()
.put(SPILL_THRESHOLD_LOW_WATERMARK, MEMORY_LOW_WATERMARK)
- .put(SPILL_THRESHOLD_HIGH_WATERMARK,
MEMORY_HIGH_WATERMARK).build();
+ .put(SPILL_THRESHOLD_HIGH_WATERMARK, MEMORY_HIGH_WATERMARK)
+ .put(MEMORY_LIMIT, MAX_MEMORY_PERCENT)
+ .put(CPU_HARD_LIMIT, MAX_CPU_PERCENT).build();
- public static final int CPU_HARD_LIMIT_DEFAULT_VALUE = 100;
+ public static final int MAX_CPU_PERCENT_DEFAULT_VALUE = 100;
// Memory limit is a string value ending with % in BE, so it is different
from other limits
// other limit is a number.
- public static final String MEMORY_LIMIT_DEFAULT_VALUE = "100%";
+ public static final String MAX_MEMORY_PERCENT_DEFAULT_VALUE = "100";
public static final int MEMORY_LOW_WATERMARK_DEFAULT_VALUE = 75;
public static final int MEMORY_HIGH_WATERMARK_DEFAULT_VALUE = 85;
private static final Map<String, String> ALL_PROPERTIES_DEFAULT_VALUE_MAP
= Maps.newHashMap();
static {
- ALL_PROPERTIES_DEFAULT_VALUE_MAP.put(CPU_SHARE, "-1");
- ALL_PROPERTIES_DEFAULT_VALUE_MAP.put(CPU_HARD_LIMIT, "100");
- ALL_PROPERTIES_DEFAULT_VALUE_MAP.put(MEMORY_LIMIT, "100%");
- ALL_PROPERTIES_DEFAULT_VALUE_MAP.put(ENABLE_MEMORY_OVERCOMMIT,
"false");
+ ALL_PROPERTIES_DEFAULT_VALUE_MAP.put(ENABLE_MEMORY_OVERCOMMIT, "true");
Review Comment:
还有这里的ENABLE_MEMORY_OVERCOMMIT
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
