system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

policy: track the autoconnect retries in devices for multi-connect

Browse source 
For connections with multi-connect property set to "multiple", the
autoconnect-retries should be tracked per device and not per connection.
That means, if autoconnect-retries is set to 2, each device using that
connection should retry to autoconnect 2 times.

The device autoconnect retries is -2 by default. This is a special
value, in NMPolicy context, if the connection used is multi-connect the
device value will be set to match the connection retries. Each time the
device picks a different connection, it will reset the device
autoconnect retries to -2 and if needed, sync. with the connection
retries.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1387

https://bugzilla.redhat.com/show_bug.cgi?id=2039734
This commit is contained in:
Fernando Fernandez Mancera 2022-09-20 17:52:29 +02:00
parent 2be9c693d9
commit 1656d82045
3 changed files with 157 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/core/devices/nm-device.c
View file

@ -96,6 +96,8 @@
#define NM_DEVICE_AUTH_RETRIES_INFINITY -2
#define NM_DEVICE_AUTH_RETRIES_DEFAULT 3
#define AUTOCONNECT_RESET_RETRIES_TIMER 300
/*****************************************************************************/
typedef void (*ActivationHandleFunc)(NMDevice *self);
@ -761,6 +763,9 @@ typedef struct _NMDevicePrivate {
GVariant *ports_variant; /* Array of port devices D-Bus path */
char *prop_ip_iface; /* IP interface D-Bus property */
int autoconnect_retries;
gint32 autoconnect_retries_blocked_until;
} NMDevicePrivate;
G_DEFINE_ABSTRACT_TYPE(NMDevice, nm_device, NM_TYPE_DBUS_OBJECT)
@ -16880,6 +16885,49 @@ nm_device_get_initial_hw_address(NMDevice *self)
return NM_DEVICE_GET_PRIVATE(self)->hw_addr_initial;
}
void
nm_device_set_autoconnect_retries(NMDevice *self, int tries)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
if (priv->autoconnect_retries != tries) {
_LOGT(LOGD_DEVICE, "autoconnect: retries set %d", tries);
priv->autoconnect_retries = tries;
}
if (tries)
priv->autoconnect_retries_blocked_until = 0; /* we are not blocked anymore */
else
priv->autoconnect_retries_blocked_until =
nm_utils_get_monotonic_timestamp_sec() + AUTOCONNECT_RESET_RETRIES_TIMER;
}
int
nm_device_get_autoconnect_retries(NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
return priv->autoconnect_retries;
}
gint32
nm_device_autoconnect_retries_blocked_until(NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
return priv->autoconnect_retries_blocked_until;
}
void
nm_device_autoconnect_retries_reset(NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
/* default value, we will sync. with connection value when needed */
priv->autoconnect_retries = -2;
priv->autoconnect_retries_blocked_until = 0;
}
/**
* nm_device_spec_match_list:
* @self: an #NMDevice
@ -17631,6 +17679,8 @@ nm_device_init(NMDevice *self)
priv->sys_iface_state_ = NM_DEVICE_SYS_IFACE_STATE_EXTERNAL;
priv->promisc_reset = NM_OPTION_BOOL_DEFAULT;
priv->autoconnect_retries = -2;
}
static GObject *

5
src/core/devices/nm-device.h
View file

@ -464,6 +464,11 @@ const char *nm_device_get_permanent_hw_address_full(NMDevice *self,
gboolean *out_is_fake);
const char *nm_device_get_initial_hw_address(NMDevice *dev);
void nm_device_set_autoconnect_retries(NMDevice *self, int tries);
int nm_device_get_autoconnect_retries(NMDevice *self);
gint32 nm_device_autoconnect_retries_blocked_until(NMDevice *self);
void nm_device_autoconnect_retries_reset(NMDevice *self);
NMDhcpConfig *nm_device_get_dhcp_config(NMDevice *dev, int addr_family);
NML3Cfg *nm_device_get_l3cfg(NMDevice *self);

112
src/core/nm-policy.c
View file

@ -1578,6 +1578,7 @@ nm_policy_unblock_failed_ovs_interfaces(NMPolicy *self)
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self);
NMSettingsConnection *const *connections = NULL;
guint i;
gboolean multiconnect = FALSE;
_LOGT(LOGD_DEVICE, "unblocking failed OVS interfaces");
@ -1585,6 +1586,13 @@ nm_policy_unblock_failed_ovs_interfaces(NMPolicy *self)
for (i = 0; connections[i]; i++) {
NMSettingsConnection *sett_conn = connections[i];
NMConnection *connection = nm_settings_connection_get_connection(sett_conn);
NMSettingConnection *s_con = nm_connection_get_setting_connection(connection);
/* Check if any connection is connect multiple */
if (s_con
&& nm_setting_connection_get_multi_connect(s_con)
== NM_CONNECTION_MULTI_CONNECT_MULTIPLE)
multiconnect = TRUE;
if (nm_connection_get_setting_ovs_interface(connection)) {
nm_settings_connection_autoconnect_retries_reset(sett_conn);
@ -1594,6 +1602,18 @@ nm_policy_unblock_failed_ovs_interfaces(NMPolicy *self)
FALSE);
}
}
/* There is, at least, one multiconnect connection with an OVS setting.
* Let's check the OVS devices retries */
if (multiconnect) {
NMDevice *device;
GHashTableIter h_iter;
g_hash_table_iter_init(&h_iter, priv->devices);
while (g_hash_table_iter_next(&h_iter, (gpointer *) &device, NULL)) {
if (nm_device_get_device_type(device) == NM_DEVICE_TYPE_OVS_INTERFACE)
nm_device_autoconnect_retries_reset(device);
}
}
}
static gboolean
@ -1605,7 +1625,8 @@ reset_autoconnect_all(
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self);
NMSettingsConnection *const *connections = NULL;
guint i;
gboolean changed = FALSE;
gboolean changed = FALSE;
gboolean multiconnect = FALSE;
_LOGD(LOGD_DEVICE,
"re-enabling autoconnect for all connections%s%s%s",
@ -1616,6 +1637,8 @@ reset_autoconnect_all(
connections = nm_settings_get_connections(priv->settings, NULL);
for (i = 0; connections[i]; i++) {
NMSettingsConnection *sett_conn = connections[i];
NMSettingConnection *s_con =
nm_connection_get_setting_connection(nm_settings_connection_get_connection(sett_conn));
if (device
&& !nm_device_check_connection_compatible(
@ -1624,6 +1647,11 @@ reset_autoconnect_all(
NULL))
continue;
if (s_con
&& nm_setting_connection_get_multi_connect(s_con)
== NM_CONNECTION_MULTI_CONNECT_MULTIPLE)
multiconnect = TRUE;
if (only_no_secrets) {
/* we only reset the no-secrets blocked flag. */
if (nm_settings_connection_autoconnect_blocked_reason_set(
@ -1652,6 +1680,20 @@ reset_autoconnect_all(
}
}
}
/* There is, at least, one multiconnect connection. Let's check the devices retries */
if (multiconnect) {
NMDevice *device_iter;
GHashTableIter h_iter;
g_hash_table_iter_init(&h_iter, priv->devices);
while (g_hash_table_iter_next(&h_iter, (gpointer *) &device_iter, NULL)) {
if (nm_device_get_autoconnect_retries(device_iter) != -2) {
nm_device_autoconnect_retries_reset(device_iter);
changed = TRUE;
}
}
}
return changed;
}
@ -1709,7 +1751,8 @@ reset_connections_retries(gpointer user_data)
NMSettingsConnection *const *connections = NULL;
guint i;
gint32 con_stamp, min_stamp, now;
gboolean changed = FALSE;
gboolean changed = FALSE;
gboolean multiconnect = FALSE;
priv->reset_retries_id = 0;
@ -1718,6 +1761,14 @@ reset_connections_retries(gpointer user_data)
connections = nm_settings_get_connections(priv->settings, NULL);
for (i = 0; connections[i]; i++) {
NMSettingsConnection *connection = connections[i];
NMSettingConnection *s_con =
nm_connection_get_setting_connection(nm_settings_connection_get_connection(connection));
/* Check if any connection is connect multiple */
if (s_con
&& nm_setting_connection_get_multi_connect(s_con)
== NM_CONNECTION_MULTI_CONNECT_MULTIPLE)
multiconnect = TRUE;
con_stamp = nm_settings_connection_autoconnect_retries_blocked_until(connection);
if (con_stamp == 0)
@ -1730,6 +1781,25 @@ reset_connections_retries(gpointer user_data)
min_stamp = con_stamp;
}
/* There is, at least, one multiconnect connection. Let's check the devices retries */
if (multiconnect) {
NMDevice *device;
GHashTableIter h_iter;
g_hash_table_iter_init(&h_iter, priv->devices);
while (g_hash_table_iter_next(&h_iter, (gpointer *) &device, NULL)) {
con_stamp = nm_device_autoconnect_retries_blocked_until(device);
/* default value in device is -2, which means, we do not care */
if (con_stamp <= 0)
continue;
if (con_stamp <= now) {
nm_device_autoconnect_retries_reset(device);
changed = TRUE;
} else if (min_stamp == 0 || min_stamp > con_stamp)
min_stamp = con_stamp;
}
}
/* Schedule the handler again if there are some stamps left */
if (min_stamp != 0)
priv->reset_retries_id =
@ -1743,21 +1813,31 @@ reset_connections_retries(gpointer user_data)
}
static void
_connection_autoconnect_retries_set(NMPolicy *self, NMSettingsConnection *connection, int tries)
_connection_autoconnect_retries_set(NMPolicy *self,
NMSettingsConnection *connection,
NMDevice *device,
int tries)
{
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self);
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self);
NMSettingConnection *s_con;
gint32 retry_time;
nm_assert(NM_IS_SETTINGS_CONNECTION(connection));
nm_assert(tries >= 0);
nm_settings_connection_autoconnect_retries_set(connection, tries);
s_con = nm_connection_get_setting_connection(nm_settings_connection_get_connection(connection));
if (s_con
&& nm_setting_connection_get_multi_connect(s_con) == NM_CONNECTION_MULTI_CONNECT_MULTIPLE) {
nm_device_set_autoconnect_retries(device, tries);
retry_time = nm_device_autoconnect_retries_blocked_until(device);
} else {
nm_settings_connection_autoconnect_retries_set(connection, tries);
retry_time = nm_settings_connection_autoconnect_retries_blocked_until(connection);
}
if (tries == 0) {
/* Schedule a handler to reset retries count */
if (!priv->reset_retries_id) {
gint32 retry_time =
nm_settings_connection_autoconnect_retries_blocked_until(connection);
g_warn_if_fail(retry_time != 0);
priv->reset_retries_id =
g_timeout_add_seconds(MAX(0, retry_time - nm_utils_get_monotonic_timestamp_sec()),
@ -2019,13 +2099,25 @@ device_state_changed(NMDevice *device,
}
if (!blocked) {
tries = nm_settings_connection_autoconnect_retries_get(sett_conn);
s_con = nm_connection_get_setting_connection(
nm_settings_connection_get_connection(sett_conn));
if (s_con
&& nm_setting_connection_get_multi_connect(s_con)
== NM_CONNECTION_MULTI_CONNECT_MULTIPLE) {
if (nm_device_get_autoconnect_retries(device) == -2)
nm_device_set_autoconnect_retries(
device,
nm_settings_connection_autoconnect_retries_get(sett_conn));
tries = nm_device_get_autoconnect_retries(device);
} else
tries = nm_settings_connection_autoconnect_retries_get(sett_conn);
if (tries > 0) {
_LOGD(LOGD_DEVICE,
"connection '%s' failed to autoconnect; %d tries left",
nm_settings_connection_get_id(sett_conn),
tries - 1);
_connection_autoconnect_retries_set(self, sett_conn, tries - 1);
_connection_autoconnect_retries_set(self, sett_conn, device, tries - 1);
} else if (tries != 0) {
_LOGD(LOGD_DEVICE,
"connection '%s' failed to autoconnect; infinite tries left",