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 1E40C73811 for ; Fri, 18 Jun 2021 13:00:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DA75026B5A for ; Fri, 18 Jun 2021 12:59:44 +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 A518B26B71 for ; Fri, 18 Jun 2021 12:59:42 +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 6BB63441D9 for ; Fri, 18 Jun 2021 12:59:42 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 12:59:32 +0200 Message-Id: <20210618105938.57107-4-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.738 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. [migrate.pm] Subject: [pve-devel] [PATCH container 3/3] migrate: enforce that rootdir 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:15 -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 container images. 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 --- src/PVE/LXC/Migrate.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index 1e5cb1e..3cd895d 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -66,6 +66,8 @@ sub prepare { my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage); PVE::Storage::storage_check_enabled($self->{storecfg}, $storage, $self->{node}); + die "content type 'rootdir' is not available on storage '$storage'\n" + if !$scfg->{content}->{rootdir}; if ($scfg->{shared}) { # PVE::Storage::activate_storage checks this for non-shared storages @@ -187,13 +189,16 @@ sub phase1 { next if !PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, undef, 1); # get list from PVE::Storage (for unreferenced volumes) - my $dl = PVE::Storage::vdisk_list($self->{storecfg}, $storeid, $vmid); + my $dl = PVE::Storage::vdisk_list($self->{storecfg}, $storeid, $vmid, undef, 'rootdir'); next if @{$dl->{$storeid}} == 0; # check if storage is available on target node PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, $self->{node}); + die "content type 'rootdir' is not available on storage '$storeid'\n" + if !$scfg->{content}->{rootdir}; + PVE::Storage::foreach_volid($dl, sub { my ($volid, $sid, $volname) = @_; -- 2.30.2