[pve-devel] [PATCH storage] Actually use target_volid
Thomas Lamprecht
t.lamprecht at proxmox.com
Wed Sep 11 13:18:43 CEST 2019
On 11.09.19 11:46, Fabian Ebner wrote:
> Migration with --targetstorage was broken because of this.
>
> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
> ---
> PVE/Storage.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/Storage.pm b/PVE/Storage.pm
> index 755eca8..31eeb21 100755
> --- a/PVE/Storage.pm
> +++ b/PVE/Storage.pm
> @@ -586,7 +586,7 @@ sub storage_migrate {
> }
> }
>
> - my @formats = volume_transfer_formats($cfg, $volid, $volid, $snapshot, $base_snapshot, $with_snapshots);
> + my @formats = volume_transfer_formats($cfg, $volid, $target_volid, $snapshot, $base_snapshot, $with_snapshots);
> die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats;
> my $format = $formats[0];
>
> @@ -598,7 +598,7 @@ sub storage_migrate {
>
> $with_snapshots = $with_snapshots ? 1 : 0; # sanitize for passing as cli parameter
> my $send = ['pvesm', 'export', $volid, $format, '-', '-with-snapshots', $with_snapshots];
> - my $recv = [@$ssh, '--', 'pvesm', 'import', $volid, $format, $import_fn, '-with-snapshots', $with_snapshots];
> + my $recv = [@$ssh, '--', 'pvesm', 'import', $target_volid, $format, $import_fn, '-with-snapshots', $with_snapshots];
> if (defined($snapshot)) {
> push @$send, '-snapshot', $snapshot
> }
>
Without testing: Looks OK, thanks for catching it.
@Wolfgang, could you also take a look at this, it seems like a regression from
your change to only using pvesm export/import in commit:
da72898cc65b2c63c25ac1988b256936f67bd72c
More information about the pve-devel
mailing list