fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 23:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/team: don't try to be too smart about timeouts

Browse source 
If we didn't get a bus name in time, there's likely not much to do. This
was probably in place before in hopes we'd fall back to the usock
backend.
This commit is contained in:
Lubomir Rintel 2022-11-21 08:45:09 +01:00
parent 2b1490962c
commit b1c8deeafe
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/devices/team/nm-device-team.c
View file

@ -326,26 +326,14 @@ teamd_dbus_timeout_cb(gpointer user_data)
g_return_val_if_fail(priv->teamd_dbus_timeout, FALSE);
priv->teamd_dbus_timeout = 0;
if (priv->teamd_pid && !priv->tdc) {
/* Timed out launching our own teamd process */
_LOGW(LOGD_TEAM, "teamd timed out");
teamd_cleanup(self, TRUE);
/* Timed out launching our own teamd process */
_LOGW(LOGD_TEAM, "teamd timed out");
teamd_cleanup(self, TRUE);
g_warn_if_fail(nm_device_is_activating(device));
nm_device_state_changed(device,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED);
} else {
/* Read again the configuration after the timeout since it might
* have changed.
*/
if (!teamd_read_config(self)) {
_LOGW(LOGD_TEAM, "failed to read teamd configuration");
nm_device_state_changed(device,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED);
}
}
g_warn_if_fail(nm_device_is_activating(device));
nm_device_state_changed(device,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED);
return G_SOURCE_REMOVE;
}