Skip to content

branch-4.1: [bugfix](memory) should force refresh workload group's config when memlimit changed #65542 #65593

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

Open
github-actions wants to merge 1 commit into
base: branch-4.1
Choose a base branch
from
+24 −32
Open

branch-4.1: [bugfix](memory) should force refresh workload group's config when memlimit changed #65542 #65593

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
56 changes: 24 additions & 32 deletions be/src/runtime/workload_group/workload_group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,38 +156,30 @@ void WorkloadGroup::check_and_update(const WorkloadGroupInfo& wg_info) {
if (UNLIKELY(wg_info.id != _id)) {
return;
}
{
std::shared_lock<std::shared_mutex> rl {_mutex};
if (LIKELY(wg_info.version <= _version)) {
return;
}
}
{
std::lock_guard<std::shared_mutex> wl {_mutex};
if (wg_info.version > _version) {
_name = wg_info.name;
_version = wg_info.version;
_min_cpu_percent = wg_info.min_cpu_percent;
_max_cpu_percent = wg_info.max_cpu_percent;
_memory_limit = wg_info.memory_limit;
_min_memory_percent = wg_info.min_memory_percent;
_max_memory_percent = wg_info.max_memory_percent;
_scan_thread_num = wg_info.scan_thread_num;
_max_remote_scan_thread_num = wg_info.max_remote_scan_thread_num;
_min_remote_scan_thread_num = wg_info.min_remote_scan_thread_num;
_memory_low_watermark = wg_info.memory_low_watermark;
_memory_high_watermark = wg_info.memory_high_watermark;
_scan_bytes_per_second = wg_info.read_bytes_per_second;
_remote_scan_bytes_per_second = wg_info.remote_read_bytes_per_second;
_total_query_slot_count = wg_info.total_query_slot_count;
_slot_mem_policy = wg_info.slot_mem_policy;
if (_max_memory_percent > 0) {
_min_memory_limit = static_cast<int64_t>(
static_cast<double>(_memory_limit * _min_memory_percent) /
_max_memory_percent);
}
} else {
return;
std::lock_guard<std::shared_mutex> wl {_mutex};
// In serverless mode, user may modify cgroup's memory limit directly and workload group's config
// is not changed. So that we should update workload group's config ignore version.
if (wg_info.version > _version ||
(wg_info.version == _version && _memory_limit != wg_info.memory_limit)) {
_name = wg_info.name;
_version = wg_info.version;
_min_cpu_percent = wg_info.min_cpu_percent;
_max_cpu_percent = wg_info.max_cpu_percent;
_memory_limit = wg_info.memory_limit;
_min_memory_percent = wg_info.min_memory_percent;
_max_memory_percent = wg_info.max_memory_percent;
_scan_thread_num = wg_info.scan_thread_num;
_max_remote_scan_thread_num = wg_info.max_remote_scan_thread_num;
_min_remote_scan_thread_num = wg_info.min_remote_scan_thread_num;
_memory_low_watermark = wg_info.memory_low_watermark;
_memory_high_watermark = wg_info.memory_high_watermark;
_scan_bytes_per_second = wg_info.read_bytes_per_second;
_remote_scan_bytes_per_second = wg_info.remote_read_bytes_per_second;
_total_query_slot_count = wg_info.total_query_slot_count;
_slot_mem_policy = wg_info.slot_mem_policy;
if (_max_memory_percent > 0) {
_min_memory_limit = static_cast<int64_t>(
static_cast<double>(_memory_limit * _min_memory_percent) / _max_memory_percent);
}
}
}
Expand Down
Loading