proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-17 15:05:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup: use a local $override_targetsid variable

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-12-20 09:55:12 +01:00 committed by Thomas Lamprecht
parent 4530494bf9
commit 8c58b12d0d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/QemuMigrate.pm
View File

@ -234,7 +234,7 @@ sub prepare {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1); my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
# check if storage is available on both nodes # check if storage is available on both nodes
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $sid; my $targetsid = $self->{opts}->{targetstorage} // $sid;
my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid); my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid);
PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node}); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node});
@ -269,6 +269,8 @@ sub sync_disks {
# local volumes which have been copied # local volumes which have been copied
$self->{volumes} = []; $self->{volumes} = [];
my $override_targetsid = $self->{opts}->{targetstorage};
eval { eval {
# found local volumes and their origin # found local volumes and their origin
@ -301,7 +303,7 @@ sub sync_disks {
next if @{$dl->{$storeid}} == 0; next if @{$dl->{$storeid}} == 0;
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $storeid; my $targetsid = $override_targetsid // $storeid;
# check if storage is available on target node # check if storage is available on target node
PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node}); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node});
@ -340,7 +342,7 @@ sub sync_disks {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $sid; my $targetsid = $override_targetsid // $sid;
# check if storage is available on both nodes # check if storage is available on both nodes
my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid); my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $sid);
PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node}); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node});
@ -442,7 +444,7 @@ sub sync_disks {
foreach my $volid (keys %$local_volumes) { foreach my $volid (keys %$local_volumes) {
my ($sid, $volname) = PVE::Storage::parse_volume_id($volid); my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $sid; my $targetsid = $override_targetsid // $sid;
if ($self->{running} && $local_volumes->{$volid}->{ref} eq 'config') { if ($self->{running} && $local_volumes->{$volid}->{ref} eq 'config') {
push @{$self->{online_local_volumes}}, $volid; push @{$self->{online_local_volumes}}, $volid;
} else { } else {