proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-04 20:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check_local_storage_availability: only count each unavailable storage once

Browse Source 
and some general cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-06-28 17:23:44 +02:00
parent c272ba8db3
commit 32075a2cb8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Qemu.pm
View File

@ -3211,12 +3211,11 @@ __PACKAGE__->register_method({
if (!$res->{running}) { if (!$res->{running}) {
$res->{allowed_nodes} = []; $res->{allowed_nodes} = [];
my $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg); my $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg);
delete $checked_nodes->{$localnode};
delete $checked_nodes->{$localnode} if $checked_nodes->{$localnode};
foreach my $node (keys %$checked_nodes) { foreach my $node (keys %$checked_nodes) {
if (!defined $checked_nodes->{$node}->{not_available_storages}){ if (!defined $checked_nodes->{$node}->{unavailable_storages}) {
push @{$res->{allowed_nodes}}, $node; push @{$res->{allowed_nodes}}, $node;
delete $checked_nodes->{$node};
} }
} }

10
PVE/QemuServer.pm
View File

@ -2942,18 +2942,24 @@ sub check_local_storage_availability {
if ($scfg->{disable}) { if ($scfg->{disable}) {
foreach my $node (keys %$nodehash) { foreach my $node (keys %$nodehash) {
push @{$nodehash->{$node}->{not_available_storages}}, $storeid; $nodehash->{$node}->{unavailable_storages}->{$storeid} = 1;
} }
} elsif (my $avail = $scfg->{nodes}) { } elsif (my $avail = $scfg->{nodes}) {
foreach my $node (keys %$nodehash) { foreach my $node (keys %$nodehash) {
if (!$avail->{$node}) { if (!$avail->{$node}) {
push @{$nodehash->{$node}->{not_available_storages}}, $storeid; $nodehash->{$node}->{unavailable_storages}->{$storeid} = 1;
} }
} }
} }
} }
}); });
foreach my $node (values %$nodehash) {
if (my $unavail = $node->{unavailable_storages}) {
$node->{unavailable_storages} = [ sort keys %$unavail ];
}
}
return $nodehash return $nodehash
} }