From 061eee986e8343df199c35d813ac14def610a92b Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 1 Dec 2019 22:19:04 -0500 Subject: [PATCH 12/12] northd: Remove misleading warning log message While debugging an ovn-kubernetes cluster, I spotted several "Duplicate MAC set" warning messages in the ovn-northd log. It looks like this message was emitted from this code path by mistake, where it correctly avoided assigning a duplicate MAC address. This patch turns off the warning for that case. Signed-off-by: Russell Bryant Acked-by: Numan Siddique --- ovn/northd/ovn-northd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index ec8f9a70f..55734b090 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -1394,7 +1394,7 @@ ipam_get_unused_mac(ovs_be32 ip) mac_addr_suffix = ((base_addr + i) % (MAC_ADDR_SPACE - 1)) + 1; mac64 = eth_addr_to_uint64(mac_prefix) | mac_addr_suffix; eth_addr_from_uint64(mac64, &mac); - if (!ipam_is_duplicate_mac(&mac, mac64, true)) { + if (!ipam_is_duplicate_mac(&mac, mac64, false)) { break; } } -- 2.23.0