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 EBAA26A77A for ; Mon, 15 Mar 2021 13:35:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D73912103F for ; Mon, 15 Mar 2021 13:34:45 +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 D855C21032 for ; Mon, 15 Mar 2021 13:34:44 +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 9D2FE443F2 for ; Mon, 15 Mar 2021 13:34:44 +0100 (CET) Message-ID: <0fe82c9c-7deb-ef0f-bc2b-183a621f9356@proxmox.com> Date: Mon, 15 Mar 2021 13:34:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:87.0) Gecko/20100101 Thunderbird/87.0 Content-Language: en-US To: Proxmox VE development discussion , Fabian Ebner References: <20210312095027.19451-1-f.ebner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210312095027.19451-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.047 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [pve-devel] [PATCH storage 1/2] 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, 15 Mar 2021 12:35:16 -0000 On 12.03.21 10:50, Fabian Ebner wrote: > Only these storages are activated in the first place, and it's bad behavior to > list images when no appropriate content type is not set. > > For example, on VM destruction, this avoids unreferenced images to be deleted > from a storage with only 'backup' content type set, which is supposedly what > happened in this[0] forum thread. > Seems to be related to a patch of mine, not that long ago: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=75854662699b261915289f36e8fbe953c5f77b7c That flag needs to still be made available in the UI, though > (Some) callers expect all keys to be present and valid array references in the > result, so initialization is needed. > > Now, the enabled check is already done by the preceding code for every element > that is iterated over, and thus isn't needed in the main loop anymore. > > [0]: https://forum.proxmox.com/threads/erasing-all-vm-disks-after-a-failed-vm-migration-task.85068 > > Signed-off-by: Fabian Ebner > --- > > Why isn't 'iterand' a word? > > PVE/Storage.pm | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/PVE/Storage.pm b/PVE/Storage.pm > index 8ee2c92..18c03ec 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 = {}; > + my $res = { map { $_ => [] } keys %{$ids} }; > > # prepare/activate/refresh all storages > > @@ -964,9 +964,8 @@ sub vdisk_list { > > activate_storage_list($cfg, $storage_list, $cache); > > - foreach my $sid (keys %$ids) { > + foreach my $sid (@{$storage_list}) { > 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}); >