From 4530494bf9f3d45c4a405c53ef3688e641f6bd8e Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 20 Dec 2018 09:55:11 +0100 Subject: [PATCH] fix local disk migration when no target storage is set the check for targetstorage in: if ($self->{running} && $self->{opts}->{targetstorage} && $local_volumes->{$volid}->{ref} eq 'config') { was obsolete, as we always set the tragetstorage opts variable to '1' in a broader "use same sid for remote local" check above. So removing it leads to the same if truthtable but fixes the check if we should fallback to the volume's SID if targetstorage is not set, as else it seemed to be always set, and '1' is naturally not a correct stroage ID. Signed-off-by: Thomas Lamprecht Signed-off-by: Wolfgang Bumiller --- PVE/QemuMigrate.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 0bae076..b12034f 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -404,10 +404,6 @@ sub sync_disks { $self->log('warn', "$err"); } - if ($self->{running} && !$sharedvm && !$self->{opts}->{targetstorage}) { - $self->{opts}->{targetstorage} = 1; #use same sid for remote local - } - if ($abort) { die "can't migrate VM - check log\n"; } @@ -447,7 +443,7 @@ sub sync_disks { foreach my $volid (keys %$local_volumes) { my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $sid; - if ($self->{running} && $self->{opts}->{targetstorage} && $local_volumes->{$volid}->{ref} eq 'config') { + if ($self->{running} && $local_volumes->{$volid}->{ref} eq 'config') { push @{$self->{online_local_volumes}}, $volid; } else { next if $rep_volumes->{$volid}; @@ -555,8 +551,8 @@ sub phase2 { push @$cmd, '--machine', $self->{forcemachine}; } - if ($self->{opts}->{targetstorage}) { - push @$cmd, '--targetstorage', $self->{opts}->{targetstorage}; + if ($self->{online_local_volumes}) { + push @$cmd, '--targetstorage', ($self->{opts}->{targetstorage} // '1'); } my $spice_port; -- 2.39.2