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