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 857FA73828 for ; Fri, 18 Jun 2021 13:00:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7453E26B98 for ; Fri, 18 Jun 2021 12:59:46 +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 5C44C26B49 for ; Fri, 18 Jun 2021 12:59:43 +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 2D3FC441D9 for ; Fri, 18 Jun 2021 12:59:43 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 12:59:34 +0200 Message-Id: <20210618105938.57107-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210618105938.57107-1-f.ebner@proxmox.com> References: <20210618105938.57107-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.718 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, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/2] migrate: enforce that image content type is available 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, 18 Jun 2021 11:00:16 -0000 and use it for the vdisk_list call too. This avoids scanning (and picking up volumes from!) storages that are not even configured to hold images. Previously, the content type was only enforced when a storage map was present. Also serves a bit as a preparation to enforce content type on guest startup, because now migration failure happens early and not only when trying to start the guest on the remote node. Signed-off-by: Fabian Ebner --- PVE/QemuMigrate.pm | 25 ++++++++++++++++--------- PVE/QemuServer.pm | 3 +++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 2576196..5f37890 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -341,7 +341,14 @@ sub prepare { my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $sid); - PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node}); + my $target_scfg = PVE::Storage::storage_check_enabled( + $self->{storecfg}, + $targetsid, + $self->{node}, + ); + + die "content type 'images' is not available on storage '$targetsid'\n" + if !$target_scfg->{content}->{images}; if ($scfg->{shared}) { # PVE::Storage::activate_storage checks this for non-shared storages @@ -396,20 +403,20 @@ sub scan_local_volumes { next if !PVE::Storage::storage_check_enabled($storecfg, $storeid, undef, 1); # get list from PVE::Storage (for unused volumes) - my $dl = PVE::Storage::vdisk_list($storecfg, $storeid, $vmid); + my $dl = PVE::Storage::vdisk_list($storecfg, $storeid, $vmid, undef, 'images'); next if @{$dl->{$storeid}} == 0; my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $storeid); # check if storage is available on target node - PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self->{node}); + my $target_scfg = PVE::Storage::storage_check_enabled( + $storecfg, + $targetsid, + $self->{node}, + ); - # grandfather in existing mismatches - if ($targetsid ne $storeid) { - my $target_scfg = PVE::Storage::storage_config($storecfg, $targetsid); - die "content type 'images' is not available on storage '$targetsid'\n" - if !$target_scfg->{content}->{images}; - } + die "content type 'images' is not available on storage '$targetsid'\n" + if !$target_scfg->{content}->{images}; my $bwlimit = PVE::Storage::get_bandwidth_limit( 'migration', diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index bd00af3..804cf79 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2458,6 +2458,9 @@ sub check_storage_availability { # check if storage is available on both nodes my $scfg = PVE::Storage::storage_check_enabled($storecfg, $sid); PVE::Storage::storage_check_enabled($storecfg, $sid, $node); + + die "content type 'images' is not available on storage '$sid'\n" + if !$scfg->{content}->{images}; }); } -- 2.30.2