From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 22CAF68EA6 for ; Mon, 22 Feb 2021 14:24:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1179A9E12 for ; Mon, 22 Feb 2021 14:24:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 54F4E9E07 for ; Mon, 22 Feb 2021 14:24:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1FFAA447F3 for ; Mon, 22 Feb 2021 14:24:11 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 22 Feb 2021 14:24:07 +0100 Message-Id: <20210222132407.30337-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common] network: get_local_ip_from_cidr: return unique IPs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 13:24:13 -0000 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 { -- 2.20.1