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 5CCC777389 for ; Tue, 20 Jul 2021 13:19:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50A342FA7C for ; Tue, 20 Jul 2021 13:19:33 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1245B2FA65 for ; Tue, 20 Jul 2021 13:19:32 +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 CD52A4230F for ; Tue, 20 Jul 2021 13:19:31 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 20 Jul 2021 13:19:27 +0200 Message-Id: <20210720111928.79632-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.678 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. [pct.pm] Subject: [pve-devel] [PATCH container 1/2] pct cpuset: use limiting cgroup 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: Tue, 20 Jul 2021 11:19:33 -0000 this is what's actually applied to the container (although the container may be imposing an even stricter limit, but that's not what we want to see...) also, the v2 cpuset list may be empty (and often is for unprivileged+nesting containers), which currently fails to parse Signed-off-by: Wolfgang Bumiller --- src/PVE/CLI/pct.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm index 8c40bbe..23e8db0 100755 --- a/src/PVE/CLI/pct.pm +++ b/src/PVE/CLI/pct.pm @@ -711,9 +711,9 @@ __PACKAGE__->register_method ({ my $cgroup = PVE::LXC::CGroup->new($vmid); my ($cpuset, $path); - if (defined($path = $cgroup->get_path('cpuset'))) { + if (defined($path = $cgroup->get_path('cpuset', 1))) { $cpuset = eval { PVE::CpuSet->new_from_path($path); }; - } elsif (defined($path = $cgroup->get_path())) { + } elsif (defined($path = $cgroup->get_path(undef, 1))) { $cpuset = eval { PVE::CpuSet->new_from_path($path); }; } else { # Container not running. -- 2.30.2