[pve-devel] [PATCH storage] Fix 2763: Revert "storage_migrate: check if target storage supports content type"

Fabian Ebner f.ebner at proxmox.com
Mon May 25 09:41:58 CEST 2020


This reverts commit 95015dbbf24b710011965805e689c03923fb830c.

parse_volname always gives 'images' and not 'rootdir'. In most
cases the volume name alone does not contain the needed information,
e.g. vm-123-disk-0 can be both a VM volume or a container volume.

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---

For this reason, we need to have the callers of storage_migrate check
if the correct content type is available. No further changes are
needed, because replication and container migration do not
change storages, and for VM migration, the check is already there.

 PVE/Storage.pm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index f1e3b19..f523f20 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -619,11 +619,6 @@ sub storage_migrate {
 
     my $tcfg = storage_config($cfg, $target_storeid);
 
-    my $vtype = (parse_volname($cfg, $volid))[0];
-
-    die "content type '$vtype' is not available on storage '$target_storeid'\n"
-	if !$tcfg->{content}->{$vtype};
-
     my $target_volname;
     if ($opts->{target_volname}) {
 	$target_volname = $opts->{target_volname};
-- 
2.20.1





More information about the pve-devel mailing list