This is an automated email from the ASF dual-hosted git repository.
jacktengg pushed a commit to branch spill_and_reserve
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/spill_and_reserve by this push:
new 37817531480 modify memory water mark default values and fix
37817531480 is described below
commit 37817531480fc9dd4357bf760587549e51982960
Author: jacktengg <tengjianp...@selectdb.com>
AuthorDate: Fri Dec 6 15:46:40 2024 +0800
modify memory water mark default values and fix
---
be/src/runtime/workload_group/workload_group.cpp | 4 ++--
be/src/runtime/workload_group/workload_group_manager.cpp | 4 ++--
.../java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/be/src/runtime/workload_group/workload_group.cpp
b/be/src/runtime/workload_group/workload_group.cpp
index b5e708b11df..7e9a9812956 100644
--- a/be/src/runtime/workload_group/workload_group.cpp
+++ b/be/src/runtime/workload_group/workload_group.cpp
@@ -48,8 +48,8 @@ const static std::string MEMORY_LIMIT_DEFAULT_VALUE = "0%";
const static bool ENABLE_MEMORY_OVERCOMMIT_DEFAULT_VALUE = true;
const static int CPU_HARD_LIMIT_DEFAULT_VALUE = -1;
-const static int MEMORY_LOW_WATERMARK_DEFAULT_VALUE = 50;
-const static int MEMORY_HIGH_WATERMARK_DEFAULT_VALUE = 80;
+const static int MEMORY_LOW_WATERMARK_DEFAULT_VALUE = 80;
+const static int MEMORY_HIGH_WATERMARK_DEFAULT_VALUE = 95;
// This is a invalid value, and should ignore this value during usage
const static int TOTAL_QUERY_SLOT_COUNT_DEFAULT_VALUE = 0;
const static int LOAD_BUFFER_RATIO_DEFAULT_VALUE = 20;
diff --git a/be/src/runtime/workload_group/workload_group_manager.cpp
b/be/src/runtime/workload_group/workload_group_manager.cpp
index 3d0a999d5d3..02de6bd5f0e 100644
--- a/be/src/runtime/workload_group/workload_group_manager.cpp
+++ b/be/src/runtime/workload_group/workload_group_manager.cpp
@@ -387,7 +387,7 @@ void WorkloadGroupMgr::handle_paused_queries() {
query_it = queries_list.erase(query_it);
continue;
}
- if (flushed_memtable_bytes < 0) {
+ if (flushed_memtable_bytes <= 0) {
flushed_memtable_bytes =
flush_memtable_from_current_group_(
query_ctx, wg, query_it->reserve_size_);
}
@@ -454,7 +454,7 @@ void WorkloadGroupMgr::handle_paused_queries() {
}
if (query_it->cache_ratio_ < 0.001) {
// 1. Check if could revoke some memory from memtable
- if (flushed_memtable_bytes < 0) {
+ if (flushed_memtable_bytes <= 0) {
flushed_memtable_bytes =
flush_memtable_from_current_group_(
query_ctx, wg, query_it->reserve_size_);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java
index 19cf26b4df8..7852d3b6302 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroup.java
@@ -118,8 +118,8 @@ public class WorkloadGroup implements Writable,
GsonPostProcessable {
public static final ImmutableMap<String, Integer> WORKLOAD_TYPE_MAP = new
ImmutableMap.Builder<String, Integer>()
.put(TWorkloadType.INTERNAL.toString().toLowerCase(),
TWorkloadType.INTERNAL.getValue()).build();
- public static final int MEMORY_LOW_WATERMARK_DEFAULT_VALUE = 50;
- public static final int MEMORY_HIGH_WATERMARK_DEFAULT_VALUE = 80;
+ public static final int MEMORY_LOW_WATERMARK_DEFAULT_VALUE = 80;
+ public static final int MEMORY_HIGH_WATERMARK_DEFAULT_VALUE = 95;
private static final Map<String, String> ALL_PROPERTIES_DEFAULT_VALUE_MAP
= Maps.newHashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
