Extract volume ID before calling 'parse_volume_id'

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-01-29 14:30:09 +01:00 committed by Fabian Grünbichler
parent 8b02e56870
commit 1764fa05d0

View File

@ -686,8 +686,10 @@ sub phase2 {
foreach my $drive (keys %{$self->{target_drive}}){
my $target = $self->{target_drive}->{$drive};
my $nbd_uri = $target->{nbd_uri};
my $source_sid = PVE::Storage::Plugin::parse_volume_id($conf->{$drive});
my $target_sid = PVE::Storage::Plugin::parse_volume_id($target->{drivestr});
my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr});
my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive});
my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_drive->{file});
my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_drive->{file});
my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$source_sid, $target_sid], $opt_bwlimit);
$self->log('info', "$drive: start migration to $nbd_uri");