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 6A2A7607E6 for ; Thu, 15 Oct 2020 12:24:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6335611C3D for ; Thu, 15 Oct 2020 12:24: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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 03F1C11C34 for ; Thu, 15 Oct 2020 12:24:31 +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 BC97B45D8E for ; Thu, 15 Oct 2020 12:24:30 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 15 Oct 2020 12:24:26 +0200 Message-Id: <20201015102426.5662-1-f.ebner@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.044 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [migrate.pm] Subject: [pve-devel] [PATCH container] fix #3030: activate volumes at the right time for restart migration 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: Thu, 15 Oct 2020 10:24:31 -0000 The lxc-pve-poststop-hook deactivates volumes when a container is stopped. To make sure that volumes are active when using the restart mode, move activate_volumes to after the conditional vm_stop. The lxc-stop command used in vm_stop waits for the hook script to complete, so there is no race. Signed-off-by: Fabian Ebner --- For VMs we don't have restart migration, so no similar bug there. An alternative would be to communicate to the hook script to not deactivate the volumes. That would mean writing the lock=migrate to the config earlier (currently it's being set in phase1) and then checking for the lock in the hookscript. src/PVE/LXC/Migrate.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index 90d74b4..5ef16d2 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -90,8 +90,6 @@ sub prepare { }); - PVE::Storage::activate_volumes($self->{storecfg}, $need_activate); - # todo: test if VM uses local resources # test ssh connection @@ -110,6 +108,8 @@ sub prepare { $running = 0; } + PVE::Storage::activate_volumes($self->{storecfg}, $need_activate); + return $running; } -- 2.20.1