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 1C14062FF8 for ; Tue, 14 Jul 2020 19:50:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 174A928F3F for ; Tue, 14 Jul 2020 19:50:31 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 59EE228F37 for ; Tue, 14 Jul 2020 19:50:30 +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 26C6A432B1 for ; Tue, 14 Jul 2020 19:50:30 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 14 Jul 2020 19:50:18 +0200 Message-Id: <20200714175018.9592-1-s.ivanov@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 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH container v2] Move volume activation to vm_start 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, 14 Jul 2020 17:50:31 -0000 currently all volumes for a container are activated in the pre-start hook, which runs in a separate mount namespace (lxc.monitor.unshare is set to 1 in our container config). This leads to problems with ZFS: * if a pool is imported by this call the filesystems are mounted only inside the containers mount namespace by running the volume activation inside vm_start, right before starting the container via systemctl the volume activation happens before the unshare. The other site where a container is started via systemctl is in 'pve-container-stop-wrapper' when a container is rebooted from the inside: By activating the volumes in 'lxc-pve-poststop-hook' we avoid to try starting a container with an inactive volume (LVM, kRBD), occuring when having a mp-addtion pending during such a reboot Starting a container manually using lxc-start is usually done for obtaining debug-logs (after starting failed with our tooling) - so the potential for regression in that case should also be small. The $loopdevlist variable is not used anywhere in our codebase since 2015 (da6298481ea4dfe7d894f42fa105cda015ebe5ce). Signed-off-by: Stoiko Ivanov --- v1 -> v2: * added the volume activation to lxc-pve-poststop-hook, after the great review from Fabian caught the case of container reboots (huge thanks!) * decided to put it in lxc-pve-poststop-hook instead of pve-container-stop-wrapper, since this avoids pulling in quite a few parts of our code-base into the latter, which currently has no imports. AFAICU the only case where this could lead to a problem is if someone uses `touch /var/lib/lxc/$vmid/reboot && systemctl restart pve-container@$vmid` for rebooting containers src/PVE/LXC.pm | 5 +++++ src/lxc-pve-poststop-hook | 6 ++++++ src/lxc-pve-prestart-hook | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index f3aca7a..db5b8ca 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2186,6 +2186,11 @@ sub vm_start { close($fh); } + my $storage_cfg = PVE::Storage::config(); + my $vollist = PVE::LXC::Config->get_vm_volumes($conf); + + PVE::Storage::activate_volumes($storage_cfg, $vollist); + my $cmd = ['systemctl', 'start', "pve-container\@$vmid"]; PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-start', 1); diff --git a/src/lxc-pve-poststop-hook b/src/lxc-pve-poststop-hook index 2683ae2..0fdd49e 100755 --- a/src/lxc-pve-poststop-hook +++ b/src/lxc-pve-poststop-hook @@ -75,6 +75,12 @@ PVE::LXC::Tools::lxc_hook('post-stop', 'lxc', sub { open(my $fh, '>', "/var/lib/lxc/$vmid/reboot") or die "failed to create reboot trigger file: $!\n"; close($fh); + + # activate all volumes of the container in case pending changes added + # a not yet activated volume + my $vollist = PVE::LXC::Config->get_vm_volumes($conf); + PVE::Storage::activate_volumes($storage_cfg, $vollist); + # cause lxc to stop instead of rebooting exit(1); } diff --git a/src/lxc-pve-prestart-hook b/src/lxc-pve-prestart-hook index ed25aa4..8823cad 100755 --- a/src/lxc-pve-prestart-hook +++ b/src/lxc-pve-prestart-hook @@ -38,11 +38,6 @@ PVE::LXC::Tools::lxc_hook('pre-start', 'lxc', sub { my $storage_cfg = PVE::Storage::config(); - my $vollist = PVE::LXC::Config->get_vm_volumes($conf); - my $loopdevlist = PVE::LXC::Config->get_vm_volumes($conf, 'rootfs'); - - PVE::Storage::activate_volumes($storage_cfg, $vollist); - my $rootdir = $vars->{ROOTFS_PATH}; # Delete any leftover reboot-trigger file -- 2.20.1