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 A427070D09 for ; Fri, 25 Jun 2021 14:32:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 71C3317DED for ; Fri, 25 Jun 2021 14:32:11 +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 id 6B4D717DE2 for ; Fri, 25 Jun 2021 14:32:09 +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 DA71C466DC for ; Fri, 25 Jun 2021 14:32:08 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 25 Jun 2021 14:32:05 +0200 Message-Id: <20210625123205.65641-1-f.ebner@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.648 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. [qemumigrate.pm] Subject: [pve-devel] [PATCH qemu-server] migrate: use correct target storage id for checks 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, 25 Jun 2021 12:32:11 -0000 The '--targetstorage' parameter does not apply to shared storages. Example for a problem solved with the enabled check: Given a VM with images only on a shared storage 'storeA', not available on the target node (i.e. restricted by the nodes property). Then using '--targetstorage storeB' would make offline migration suddenly "work", but of course the disks would not be accessible and then trying to migrate back would fail... Example for a problem solved with the content type check: if a VM had a shared ISO image, and there was a '--targetstorage storeA' option, availablity of the 'iso' content type is checked for 'storeA', which is wrong as the ISO would not be moved to that storage. Signed-off-by: Fabian Ebner --- The first kind of issue is also present in stable-6. PVE/QemuMigrate.pm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 0b41db7..7047d02 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -337,9 +337,15 @@ sub prepare { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1); # check if storage is available on both nodes - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); - my $scfg = PVE::Storage::storage_check_enabled($storecfg, $sid); + + my $targetsid; + if ($scfg->{shared}) { + $targetsid = $sid; + } else { + $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + } + my $target_scfg = PVE::Storage::storage_check_enabled( $storecfg, $targetsid, @@ -472,9 +478,16 @@ sub scan_local_volumes { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); # check if storage is available on both nodes my $scfg = PVE::Storage::storage_check_enabled($storecfg, $sid); + + my $targetsid; + if ($scfg->{shared}) { + $targetsid = $sid; + } else { + $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + } + PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self->{node}); return if $scfg->{shared}; -- 2.30.2