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 989CA6AE92 for ; Mon, 25 Jan 2021 12:06:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 887B996ED for ; Mon, 25 Jan 2021 12:05:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id E9B6996E2 for ; Mon, 25 Jan 2021 12:05:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id ABFA744EF3 for ; Mon, 25 Jan 2021 12:05:33 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Mon, 25 Jan 2021 12:05:32 +0100 Message-Id: <20210125110532.20342-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH container] use monitor commands to freeze on pure-v2 setups 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: Mon, 25 Jan 2021 11:06:05 -0000 even an explicit query for the 'unified' cgroup hierarchy does not work on lxc when run in a pure v2 environment via the kernel options systemd.unified_cgroup_hierarchy=1 cgroup_no_v1=all so let's use the freeze commands provided by lxc we already have code for... Signed-off-by: Wolfgang Bumiller See-also: https://forum.proxmox.com/threads/short-read-on-command-socket-error-when-running-backup-of-lxc-containers.82978/ --- src/PVE/LXC.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index e7a6951..7e84a0e 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2463,12 +2463,20 @@ sub get_lxc_version() { sub freeze($) { my ($vmid) = @_; - PVE::LXC::CGroup->new($vmid)->freeze_thaw(1); + if (PVE::CGroup::cgroup_mode() == 2) { + PVE::LXC::Command::freeze($vmid, 30); + } else { + PVE::LXC::CGroup->new($vmid)->freeze_thaw(1); + } } sub thaw($) { my ($vmid) = @_; - PVE::LXC::CGroup->new($vmid)->freeze_thaw(0); + if (PVE::CGroup::cgroup_mode() == 2) { + PVE::LXC::Command::unfreeze($vmid, 30); + } else { + PVE::LXC::CGroup->new($vmid)->freeze_thaw(0); + } } 1; -- 2.20.1