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

device: fix activating slave device when stage1 delays action

Browse source 
When activating for example a team device which is to be enslaved to a
bridge, nm_device_activate_stage1_device_prepare() will postpone
stage 2.

In that case, we didn't register the "master-ready" of the team
device and thus never progressed the slave from stage2.

Reproduce:

  # nmcli connection delete t-br0
  # nmcli connection delete t-team0
  nmcli connection add type bridge con-name t-br0   autoconnect no ifname i-br0 ip4 192.168.177.100/24 gw4 192.168.177.1
  nmcli connection add type team   con-name t-team0 autoconnect no ifname i-team0
  nmcli connection modify id t-team0 connection.master i-br0 connection.slave-type bridge
  nmcli connection up t-team0
This commit is contained in:
Thomas Haller 2015-10-01 16:48:32 +02:00
parent 86b6b6ed32
commit 5f8aa51e63
1 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/devices/nm-device.c
View file

@ -343,6 +343,7 @@ typedef struct {
/* master interface for bridge/bond/team slave */ /* master interface for bridge/bond/team slave */
NMDevice * master; NMDevice * master;
gboolean enslaved; gboolean enslaved;
gboolean master_ready_handled;
guint master_ready_id; guint master_ready_id;
/* slave management */ /* slave management */
@ -2658,19 +2659,22 @@ get_ip_config_may_fail (NMDevice *self, int family)
} }
static void static void
master_ready_cb (NMActiveConnection *active, master_ready (NMDevice *self,
GParamSpec *pspec, NMActiveConnection *active)
NMDevice *self)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMActiveConnection *master; NMActiveConnection *master;
g_assert (priv->state == NM_DEVICE_STATE_PREPARE); g_return_if_fail (priv->state == NM_DEVICE_STATE_PREPARE);
g_return_if_fail (!priv->master_ready_handled);
/* Notify a master device that it has a new slave */ /* Notify a master device that it has a new slave */
g_assert (nm_active_connection_get_master_ready (active)); g_return_if_fail (nm_active_connection_get_master_ready (active));
master = nm_active_connection_get_master (active); master = nm_active_connection_get_master (active);
priv->master_ready_handled = TRUE;
nm_clear_g_signal_handler (active, &priv->master_ready_id);
priv->master = g_object_ref (nm_active_connection_get_device (master)); priv->master = g_object_ref (nm_active_connection_get_device (master));
nm_device_master_add_slave (priv->master, nm_device_master_add_slave (priv->master,
self, self,
@ -2679,8 +2683,14 @@ master_ready_cb (NMActiveConnection *active,
_LOGD (LOGD_DEVICE, "master connection ready; master device %s", _LOGD (LOGD_DEVICE, "master connection ready; master device %s",
nm_device_get_iface (priv->master)); nm_device_get_iface (priv->master));
nm_clear_g_signal_handler (active, &priv->master_ready_id); }
static void
master_ready_cb (NMActiveConnection *active,
GParamSpec *pspec,
NMDevice *self)
{
master_ready (self, active);
nm_device_activate_schedule_stage2_device_config (self); nm_device_activate_schedule_stage2_device_config (self);
} }
@ -2728,23 +2738,7 @@ nm_device_activate_stage1_device_prepare (gpointer user_data)
g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS); g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS);
} }
if (nm_active_connection_get_master (active)) { nm_device_activate_schedule_stage2_device_config (self);
/* If the master connection is ready for slaves, attach ourselves */
if (nm_active_connection_get_master_ready (active))
master_ready_cb (active, NULL, self);
else {
_LOGD (LOGD_DEVICE, "waiting for master connection to become ready");
/* Attach a signal handler and wait for the master connection to begin activating */
g_assert (priv->master_ready_id == 0);
priv->master_ready_id = g_signal_connect (active,
"notify::" NM_ACTIVE_CONNECTION_INT_MASTER_READY,
(GCallback) master_ready_cb,
self);
/* Postpone */
}
} else
nm_device_activate_schedule_stage2_device_config (self);
out: out:
_LOGD (LOGD_DEVICE, "Activation: Stage 1 of 5 (Device Prepare) complete."); _LOGD (LOGD_DEVICE, "Activation: Stage 1 of 5 (Device Prepare) complete.");
@ -2798,6 +2792,28 @@ nm_device_activate_stage2_device_config (gpointer user_data)
NMActiveConnection *active = NM_ACTIVE_CONNECTION (priv->act_request); NMActiveConnection *active = NM_ACTIVE_CONNECTION (priv->act_request);
GSList *iter; GSList *iter;
if (!priv->master_ready_handled) {
if (!nm_active_connection_get_master (active))
priv->master_ready_handled = TRUE;
else {
/* If the master connection is ready for slaves, attach ourselves */
if (nm_active_connection_get_master_ready (active))
master_ready (self, active);
else {
_LOGD (LOGD_DEVICE, "waiting for master connection to become ready");
if (priv->master_ready_id == 0) {
priv->master_ready_id = g_signal_connect (active,
"notify::" NM_ACTIVE_CONNECTION_INT_MASTER_READY,
(GCallback) master_ready_cb,
self);
}
/* Postpone */
return FALSE;
}
}
}
/* Clear the activation source ID now that this stage has run */ /* Clear the activation source ID now that this stage has run */
activation_source_clear (self, FALSE, 0); activation_source_clear (self, FALSE, 0);
@ -6025,6 +6041,7 @@ clear_act_request (NMDevice *self)
nm_active_connection_set_default (NM_ACTIVE_CONNECTION (priv->act_request), FALSE); nm_active_connection_set_default (NM_ACTIVE_CONNECTION (priv->act_request), FALSE);
priv->master_ready_handled = FALSE;
nm_clear_g_signal_handler (priv->act_request, &priv->master_ready_id); nm_clear_g_signal_handler (priv->act_request, &priv->master_ready_id);
g_clear_object (&priv->act_request); g_clear_object (&priv->act_request);