From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A8AF291800 for ; Fri, 7 Oct 2022 14:42:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 680EC25DC9 for ; Fri, 7 Oct 2022 14:42:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 7 Oct 2022 14:42:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FC234486C for ; Fri, 7 Oct 2022 14:42:04 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 7 Oct 2022 14:41:42 +0200 Message-Id: <20221007124156.110246-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221007124156.110246-1-f.ebner@proxmox.com> References: <20221007124156.110246-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm] Subject: [pve-devel] [PATCH container 2/7] change cpu shares: hard-code cgroupv1 default parameter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2022 12:42:36 -0000 so that the description of the default can be changed to reflect that it depends on cgroup version. Not strictly necessary, because the function currently will ignore the value anyways. But certainly more future-proof then starting to pass something invalid. Signed-off-by: Fiona Ebner --- src/PVE/LXC/Config.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index d66cb75..48e0a6e 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1342,7 +1342,7 @@ sub vmconfig_hotplug_pending { } elsif ($opt eq 'cpulimit') { $cgroup->change_cpu_quota(undef, undef); # reset, cgroup module can better decide values } elsif ($opt eq 'cpuunits') { - $cgroup->change_cpu_shares(undef, $confdesc->{cpuunits}->{default}); + $cgroup->change_cpu_shares(undef, 1024); } elsif ($opt =~ m/^net(\d)$/) { my $netid = $1; PVE::Network::veth_delete("veth${vmid}i$netid"); @@ -1367,7 +1367,7 @@ sub vmconfig_hotplug_pending { my $quota = 100000 * $value; $cgroup->change_cpu_quota(int(100000 * $value), 100000); } elsif ($opt eq 'cpuunits') { - $cgroup->change_cpu_shares($value, $confdesc->{cpuunits}->{default}); + $cgroup->change_cpu_shares($value, 1024); } elsif ($opt =~ m/^net(\d+)$/) { my $netid = $1; my $net = $class->parse_lxc_network($value); -- 2.30.2