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

storage_migrate: add volname_for_storage helper

Browse Source 
to guess a valid volname for a targetstorage of a different type.
This makes it possible to migrate raw volumes between 'dir' and 'lvm'
storages.

It is only used when the storage type for the source storage X
and target storage Y differ and should work as long as Y uses
the standard naming scheme (VMID/vm-VMID-name.fmt respectively vm-VMID-name).
If it doesn't, we get an invalid name and fail, which is the old
behavior (except if X and Y have different types but the same
non-standard naming-scheme, where the old behavior did work).

The original name is preserved, except for a possible extension
and it's also checked if the format is valid for the target storage.
Example: mylvm:vm-123-disk-4 <-> mydir:123/vm-123-disk-4.raw

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2020-04-08 11:25:14 +02:00
committed by Fabian Grünbichler
parent a97d3ee49f
commit 683a3f463f
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
PVE/Storage.pm
View File

@ -562,6 +562,25 @@ sub abs_filesystem_path {
return $path;
}
my $volname_for_storage = sub {
my ($cfg, $volid, $target_storeid) = @_;
my (undef, $name, $vmid, undef, undef, undef, $format) = parse_volname($cfg, $volid);
my $target_scfg = storage_config($cfg, $target_storeid);
my (undef, $valid_formats) = PVE::Storage::Plugin::default_format($target_scfg);
my $format_is_valid = grep { $_ eq $format } @$valid_formats;
die "unsupported format '$format' for storage type $target_scfg->{type}\n" if !$format_is_valid;
(my $name_without_extension = $name) =~ s/\.$format$//;
if ($target_scfg->{path}) {
return "$vmid/$name_without_extension.$format";
} else {
return "$name_without_extension";
}
};
sub storage_migrate {
my ($cfg, $volid, $target_sshinfo, $target_storeid, $opts, $logfunc) = @_;
@ -573,7 +592,6 @@ sub storage_migrate {
my $allow_rename = $opts->{allow_rename} ? 1 : 0;
my ($storeid, $volname) = parse_volume_id($volid);
my $target_volname = $opts->{target_volname} || $volname;
my $scfg = storage_config($cfg, $storeid);
@ -587,6 +605,15 @@ sub storage_migrate {
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};
} elsif ($scfg->{type} eq $tcfg->{type}) {
$target_volname = $volname;
} else {
$target_volname = $volname_for_storage->($cfg, $volid, $target_storeid);
}
my $target_volid = "${target_storeid}:${target_volname}";
my $target_ip = $target_sshinfo->{ip};