fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-18 09:50:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ovs-interface: add trace messages when waiting for link

Browse source 
Also, add prefix "ovs-wait-link" to all messages related to waiting
for the ovs link, so that they can be easily spotted in logs.

(cherry picked from commit 49a7bd110d)
(cherry picked from commit 1f2cf7d1f5)
This commit is contained in:
Beniamino Galvani 2023-10-18 16:55:31 +02:00 • committed by Fernando Fernandez Mancera
parent fa17b883d4
commit 9e7353dca8
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/devices/ovs/nm-device-ovs-interface.c
View file

@ -124,7 +124,8 @@ check_connection_compatible(NMDevice *device, NMConnection *connection, GError *
static void
link_changed(NMDevice *device, const NMPlatformLink *pllink)
{
NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE(device);
NMDeviceOvsInterface *self = NM_DEVICE_OVS_INTERFACE(device);
NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE(self);
if (!pllink || !priv->wait_link.waiting)
return;
@ -139,6 +140,9 @@ link_changed(NMDevice *device, const NMPlatformLink *pllink)
nm_device_devip_set_failed(device, AF_INET6, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
return;
}
_LOGT(LOGD_CORE, "ovs-wait-link: link is ready after link changed event");
nm_device_bring_up(device);
nm_device_devip_set_state(device, AF_INET, NM_DEVICE_IP_STATE_PENDING, NULL);
@ -217,6 +221,10 @@ _set_ip_ifindex_tun(gpointer user_data)
NMDeviceOvsInterface *self = NM_DEVICE_OVS_INTERFACE(device);
NMDeviceOvsInterfacePrivate *priv = NM_DEVICE_OVS_INTERFACE_GET_PRIVATE(self);
_LOGT(LOGD_CORE,
"ovs-wait-link: setting ip-ifindex %d from tun interface",
priv->wait_link.tun_ifindex);
nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
priv->wait_link.waiting = FALSE;
@ -244,10 +252,11 @@ _netdev_tun_link_cb(NMPlatform *platform,
if (change_type == NM_PLATFORM_SIGNAL_ADDED) {
if (pllink->type == NM_LINK_TYPE_TUN
&& nm_streq0(pllink->name, nm_device_get_iface(device))) {
_LOGT(LOGD_CORE,
"ovs-wait-link: found matching tun interface, schedule set-ip-ifindex(%d)",
ifindex);
nm_clear_g_signal_handler(platform, &priv->wait_link.tun_link_signal_id);
priv->wait_link.tun_ifindex = ifindex;
priv->wait_link.tun_set_ifindex_idle_source =
nm_g_idle_add_source(_set_ip_ifindex_tun, device);
}
@ -314,12 +323,16 @@ act_stage3_ip_config(NMDevice *device, int addr_family)
*
* This should change. */
if (nm_device_get_ip_ifindex(device) <= 0) {
_LOGT(LOGD_DEVICE, "waiting for link to appear");
_LOGT(LOGD_DEVICE, "ovs-wait-link: waiting for link to appear");
priv->wait_link.waiting = TRUE;
nm_device_devip_set_state(device, addr_family, NM_DEVICE_IP_STATE_PENDING, NULL);
return;
}
_LOGT(LOGD_DEVICE,
"ovs-wait-link: link is ready, IPv%c can proceed",
nm_utils_addr_family_to_char(addr_family));
priv->wait_link.waiting = FALSE;
nm_clear_g_source_inst(&priv->wait_link.tun_set_ifindex_idle_source);
nm_clear_g_signal_handler(nm_device_get_platform(device), &priv->wait_link.tun_link_signal_id);