proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-01 19:31:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate: handle storage not selected manually in storage config

Browse Source 
e.g. local storage was considered not allowed for offline migration
even if it is available on all nodes, this should now be fixed as it
is now considered available on all nodes if a local storage isn't
restricted to a specific subset of the available nodes. The user is
responseable to make sure that the datacenter storage config reflects
the actual setup, so there is no additional check for local storages
which aren't available on all nodes if they are not explicitly marked
at datacenter level.

Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx 2019-06-28 15:13:45 +02:00 committed by Thomas Lamprecht
parent 8ebf1734e9
commit f25852c27e
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/API2/Qemu.pm
View File

@ -3163,7 +3163,12 @@ __PACKAGE__->register_method({
allowed_nodes => {
type => 'array',
optional => 1,
description => "List nodes allowed for offline migration with same local storage as source node, only passed if VM is offline"
description => "List nodes allowed for offline migration, only passed if VM is offline"
},
not_allowed_nodes => {
type => 'object',
optional => 1,
description => "List not allowed nodes with additional informations, only passed if VM is offline"
},
local_disks => {
type => 'array',
@ -3204,11 +3209,18 @@ __PACKAGE__->register_method({
# if vm is not running, return target nodes where local storage is available
# for offline migration
if (!$res->{running}) {
my $shared_nodes = PVE::QemuServer::shared_nodes($vmconf, $storecfg);
$res->{allowed_nodes} = [];
my $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg);
delete $shared_nodes->{$localnode} if $shared_nodes->{$localnode};
delete $checked_nodes->{$localnode} if $checked_nodes->{$localnode};
foreach my $node (keys %$checked_nodes) {
if (!defined $checked_nodes->{$node}->{not_available_storages}){
push @{$res->{allowed_nodes}}, $node;
delete $checked_nodes->{$node};
}
$res->{allowed_nodes} = [ keys %$shared_nodes ];
}
$res->{not_allowed_nodes} = $checked_nodes;
}

33
PVE/QemuServer.pm
View File

@ -2924,6 +2924,39 @@ sub shared_nodes {
return $nodehash
}
sub check_local_storage_availability {
my ($conf, $storecfg) = @_;
my $nodelist = PVE::Cluster::get_nodelist();
my $nodehash = { map { $_ => {} } @$nodelist };
foreach_drive($conf, sub {
my ($ds, $drive) = @_;
my $volid = $drive->{file};
return if !$volid;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
if ($storeid) {
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
if ($scfg->{disable}) {
foreach my $node (keys %$nodehash) {
push @{$nodehash->{$node}->{not_available_storages}}, $storeid;
}
} elsif (my $avail = $scfg->{nodes}) {
foreach my $node (keys %$nodehash) {
if (!$avail->{$node}) {
push @{$nodehash->{$node}->{not_available_storages}}, $storeid;
}
}
}
}
});
return $nodehash
}
sub check_cmdline {
my ($pidfile, $pid) = @_;