Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-01-05 17:17:36 +03:00
Code Releases Activity

cgroup: allow one to set the memory.high CGv2 knob too

Browse Source 
will be used from our current only call site in pve-container.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-04-17 16:16:36 +02:00
parent 5aab227bf3
commit 2b4c66788a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PVE/CGroup.pm
View File

@ -408,7 +408,7 @@ sub get_pressure_stat {
#
# Dies on error (including a not-running or currently-shutting-down guest).
sub change_memory_limit {
my ($self, $mem_bytes, $swap_bytes) = @_;
my ($self, $mem_bytes, $swap_bytes, $mem_high_bytes) = @_;
my ($path, $ver) = $self->get_path('memory', 1);
if (!defined($path)) {
@ -416,8 +416,11 @@ sub change_memory_limit {
} elsif ($ver == 2) {
PVE::ProcFSTools::write_proc_entry("$path/memory.swap.max", $swap_bytes)
if defined($swap_bytes);
PVE::ProcFSTools::write_proc_entry("$path/memory.max", $mem_bytes)
if defined($mem_bytes);
if (defined($mem_bytes)) {
# 'max' is the hard-limit (triggers OOM), while 'high' throttles & adds reclaim pressure
PVE::ProcFSTools::write_proc_entry("$path/memory.high", $mem_high_bytes // 'max');
PVE::ProcFSTools::write_proc_entry("$path/memory.max", $mem_bytes);
}
} elsif ($ver == 1) {
# With cgroupv1 we cannot control memory and swap limits separately.
# This also means that since the two values aren't independent, we need to handle