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 BFB7F6955F for ; Mon, 22 Mar 2021 15:33:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B646D2581A for ; Mon, 22 Mar 2021 15:32:50 +0100 (CET) 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 DAC41257EB for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A456E42E4F for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 22 Mar 2021 15:32:40 +0100 Message-Id: <20210322143243.6606-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.005 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 Subject: [pve-devel] [PATCH storage 1/4] Revert "vdisk list: only collect images from storages with an appropriate content type" 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: Mon, 22 Mar 2021 14:33:20 -0000 This reverts commit a44c18925d223a971296801a0985db34707ada4d and adds a reminder comment. The mentioned commit is actually a backwards-incompatible change that leads to slightly different behavior when migrating a VM with volumes on a misconfigured storage. For example, unreferenced volumes on a misconfigured storage won't be picked up, even though they were before. And for referenced volumes on a misconfigured storage, the disk size would not be updated on migration anymore. We should wait until the next major release for this change and then also re-evaluate the migration behavior with misconfigured disks. Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 18c03ec..19f675d 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -938,7 +938,7 @@ sub vdisk_list { storage_check_enabled($cfg, $storeid) if ($storeid); - my $res = { map { $_ => [] } keys %{$ids} }; + my $res = {}; # prepare/activate/refresh all storages @@ -964,8 +964,10 @@ sub vdisk_list { activate_storage_list($cfg, $storage_list, $cache); - foreach my $sid (@{$storage_list}) { + # FIXME PVE 7.0: only scan storages with the correct content types + foreach my $sid (keys %$ids) { next if $storeid && $storeid ne $sid; + next if !storage_check_enabled($cfg, $sid, undef, 1); my $scfg = $ids->{$sid}; my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); -- 2.20.1