proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-24 22:32:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

network: get_local_ip_from_cidr: return unique IPs

Browse Source 
to avoid erroring out when "multiple" addresses are configured on live
migration, when in fact it's the same IP multiple times.

Seems like the same problem for a caller in pve-cluster was fixed by checking
the uniqueness afterwards, see commit 266041169beb36c8892ca54265e2d91335307ffb
in pve-cluster. But there doesn't seem to be any caller relying on the current
behavior, and no additional information other than the addresses are returned,
so fix it here.

Reported here:
https://forum.proxmox.com/threads/live-migration-of-vms-via-full-mesh-network-could-not-get-ip-multiple-addresses-configured-on-local-node-for-network.84585/

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-02-22 14:24:07 +01:00 committed by Thomas Lamprecht
parent 3fae4d24a9
commit 1e55a6cd22
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PVE/Network.pm
View File

@ -599,14 +599,14 @@ sub is_ip_in_cidr {
sub get_local_ip_from_cidr {
my ($cidr) = @_;
my $IPs = [];
my $IPs = {};
run_command(['/sbin/ip', 'address', 'show', 'to', $cidr, 'up'], outfunc => sub {
if ($_[0] =~ m!^\s*inet(?:6)?\s+($PVE::Tools::IPRE)(?:/\d+|\s+peer\s+)!) {
push @$IPs, $1;
$IPs->{$1} = 1;
}
});
return $IPs;
return [ keys %{$IPs} ];
}
sub addr_to_ip {