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

storage_migrate: with_snapshots parameter

Browse Source 
Since the migration code already has to check snapshots and
we still want to be able to migrate raw disks, we cannot
always pass -with-snapshots 1.
This commit is contained in:
Wolfgang Bumiller
2017-06-22 12:24:38 +02:00
committed by Dietmar Maurer
parent 123ee4714e
commit e8a7e764af
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage.pm
View File

@ -525,7 +525,7 @@ sub abs_filesystem_path {
} }
sub storage_migrate { sub storage_migrate {
my ($cfg, $volid, $target_sshinfo, $target_storeid, $target_volname, $base_snapshot, $snapshot, $ratelimit_bps, $insecure) = @_; my ($cfg, $volid, $target_sshinfo, $target_storeid, $target_volname, $base_snapshot, $snapshot, $ratelimit_bps, $insecure, $with_snapshots) = @_;
my ($storeid, $volname) = parse_volume_id($volid); my ($storeid, $volname) = parse_volume_id($volid);
$target_volname = $volname if !$target_volname; $target_volname = $volname if !$target_volname;
@ -557,7 +557,7 @@ sub storage_migrate {
} }
} }
my @formats = volume_transfer_formats($cfg, $volid, $volid, $snapshot, $base_snapshot, 1); my @formats = volume_transfer_formats($cfg, $volid, $volid, $snapshot, $base_snapshot, $with_snapshots);
die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats; die "cannot migrate from storage type '$scfg->{type}' to '$tcfg->{type}'\n" if !@formats;
my $format = $formats[0]; my $format = $formats[0];
@ -569,8 +569,9 @@ sub storage_migrate {
} }
} }
my $send = ['pvesm', 'export', $volid, $format, '-', '-with-snapshots', '1']; $with_snapshots = $with_snapshots ? 1 : 0; # sanitize for passing as cli parameter
my $recv = [@$ssh, @insecurecmd, '--', 'pvesm', 'import', $volid, $format, '-', '-with-snapshots', '1']; my $send = ['pvesm', 'export', $volid, $format, '-', '-with-snapshots', $with_snapshots];
my $recv = [@$ssh, @insecurecmd, '--', 'pvesm', 'import', $volid, $format, '-', '-with-snapshots', $with_snapshots];
if (defined($snapshot)) { if (defined($snapshot)) {
push @$send, '-snapshot', $snapshot push @$send, '-snapshot', $snapshot
} }