fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 07:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

team: ensure that teamd_start does not get called when already starting

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2013-10-02 17:44:12 +02:00
parent b573de0408
commit e4fc7440cc
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/devices/nm-device-team.c
View file

@ -271,10 +271,10 @@ teamd_timeout_cb (gpointer user_data)
NMDevice *dev = NM_DEVICE (user_data); NMDevice *dev = NM_DEVICE (user_data);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev);
if (priv->teamd_timeout) { g_return_val_if_fail (priv->teamd_timeout, FALSE);
nm_log_info (LOGD_TEAM, "(%s): teamd timed out.", nm_device_get_iface (dev));
teamd_cleanup (dev); nm_log_info (LOGD_TEAM, "(%s): teamd timed out.", nm_device_get_iface (dev));
} teamd_cleanup (dev);
return FALSE; return FALSE;
} }
@ -288,8 +288,7 @@ teamd_dbus_appeared (GDBusConnection *connection,
NMDevice *dev = NM_DEVICE (user_data); NMDevice *dev = NM_DEVICE (user_data);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev);
if (!priv->teamd_dbus_watch) g_return_if_fail (priv->teamd_dbus_watch);
return;
nm_log_info (LOGD_TEAM, "(%s): teamd appeared on D-Bus", nm_device_get_iface (dev)); nm_log_info (LOGD_TEAM, "(%s): teamd appeared on D-Bus", nm_device_get_iface (dev));
teamd_timeout_remove (dev); teamd_timeout_remove (dev);
@ -319,8 +318,8 @@ teamd_dbus_vanished (GDBusConnection *connection,
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev);
NMDeviceState state; NMDeviceState state;
if (!priv->teamd_dbus_watch) g_return_if_fail (priv->teamd_dbus_watch);
return;
nm_log_info (LOGD_TEAM, "(%s): teamd vanished from D-Bus", nm_device_get_iface (dev)); nm_log_info (LOGD_TEAM, "(%s): teamd vanished from D-Bus", nm_device_get_iface (dev));
teamd_cleanup (dev); teamd_cleanup (dev);
@ -379,6 +378,19 @@ teamd_start (NMDevice *dev, NMSettingTeam *s_team, NMDeviceTeamPrivate *priv)
gboolean ret; gboolean ret;
int status; int status;
if (priv->teamd_dbus_watch ||
priv->teamd_process_watch ||
priv->teamd_pid > 0 ||
#if WITH_TEAMDCTL
priv->tdc ||
#endif
priv->teamd_timeout)
{
/* FIXME g_assert that this never hits. For now, be more reluctant, and try to recover. */
g_warn_if_reached ();
teamd_cleanup (dev);
}
teamd_binary = teamd_paths; teamd_binary = teamd_paths;
while (*teamd_binary != NULL) { while (*teamd_binary != NULL) {
if (g_file_test (*teamd_binary, G_FILE_TEST_EXISTS)) if (g_file_test (*teamd_binary, G_FILE_TEST_EXISTS))