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 C83E269934 for ; Tue, 14 Sep 2021 09:04:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B432A9F55 for ; Tue, 14 Sep 2021 09:03:34 +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 27AAE9F46 for ; Tue, 14 Sep 2021 09:03:34 +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 E56884480C for ; Tue, 14 Sep 2021 09:03:33 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20210625123205.65641-1-f.ebner@proxmox.com> From: Fabian Ebner Message-ID: Date: Tue, 14 Sep 2021 09:03:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210625123205.65641-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.330 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 NICE_REPLY_A -1.969 Looks like a legit reply (A) 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: Re: [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: Tue, 14 Sep 2021 07:04:04 -0000 Ping Am 25.06.21 um 14:32 schrieb Fabian Ebner: > 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}; >