yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "vdisk list: only collect images from storages with an appropriate content type"

Browse Source 
This reverts commit a44c18925d 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 <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2021-03-22 15:32:40 +01:00
committed by Thomas Lamprecht
parent 2bce96c513
commit 26d7314be0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/Storage.pm
View File

@ -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});