proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-09 11:29:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

live storage migration : fix check of target storage availability

Browse Source 
if we define a different target storeid for remote node,
and that storage is not available on source node

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
(cherry picked from commit d80ad67f9d)
This commit is contained in:
Alexandre Derumier 2017-04-21 03:39:34 +02:00 committed by Fabian Grünbichler
parent 59c2b3a8ca
commit 08f918daab
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Qemu.pm
View File

@ -2827,7 +2827,12 @@ __PACKAGE__->register_method({
} }
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
if( $param->{targetstorage}) {
PVE::Storage::storage_check_node($storecfg, $param->{targetstorage}, $target);
} else {
PVE::QemuServer::check_storage_availability($storecfg, $conf, $target); PVE::QemuServer::check_storage_availability($storecfg, $conf, $target);
}
if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') { if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {

6
PVE/QemuMigrate.pm
View File

@ -255,8 +255,10 @@ sub sync_disks {
next if @{$dl->{$storeid}} == 0; next if @{$dl->{$storeid}} == 0;
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $storeid;
# check if storage is available on target node # check if storage is available on target node
PVE::Storage::storage_check_node($self->{storecfg}, $storeid, $self->{node}); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node});
$sharedvm = 0; # there is a non-shared disk $sharedvm = 0; # there is a non-shared disk
PVE::Storage::foreach_volid($dl, sub { PVE::Storage::foreach_volid($dl, sub {
@ -293,7 +295,7 @@ sub sync_disks {
my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $sid; my $targetsid = $self->{opts}->{targetstorage} ? $self->{opts}->{targetstorage} : $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}, $sid, $self->{node}); PVE::Storage::storage_check_node($self->{storecfg}, $targetsid, $self->{node});
return if $scfg->{shared}; return if $scfg->{shared};