From 1e55a6cd22fb24710dfedc7dfc87076f883e7579 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Mon, 22 Feb 2021 14:24:07 +0100 Subject: [PATCH] network: get_local_ip_from_cidr: return unique IPs 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 --- src/PVE/Network.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index 12536c7..3b1afdd 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -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 {