fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 07:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: suppress wrong warning about wait-device-timeout for devices that are still busy

Browse source 
Imagine we wait for a device, the device appears and starts activating.
That might take a while (during which it has a pending action). In the
meantime, the "connection.wait-device-timeout" timeout expires.

Now we want to log a warning about profiles that don't have their
device upon timeout. However, that the device is still busy at that
point is irrelevant. Skip logging a message about those profiles.

Fixes: 3df662f534 ('settings: rework wait-device-timeout handling and consider device compatibility')
This commit is contained in:
Thomas Haller 2020-08-13 10:09:09 +02:00
parent 717b0f71e1
commit d9568ca3ee
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/settings/nm-settings.c
View file

@ -479,7 +479,8 @@ _startup_complete_data_destroy (StartupCompleteData *scd)
static gboolean
_startup_complete_check_is_ready (NMSettings *self,
NMSettingsConnection *sett_conn)
NMSettingsConnection *sett_conn,
gboolean ignore_pending_actions)
{
NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
NMConnection *conn;
@ -497,7 +498,8 @@ _startup_complete_check_is_ready (NMSettings *self,
continue;
if ( nm_device_get_state (device) < NM_DEVICE_STATE_UNAVAILABLE
|| nm_device_has_pending_action (device)) {
|| ( !ignore_pending_actions
&& nm_device_has_pending_action (device))) {
/* while a device is not yet available and still has a pending
* action itself, it's not a suitable candidate. */
continue;
@ -568,7 +570,7 @@ _startup_complete_check (NMSettings *self,
if (scd->timeout_msec <= elapsed_msec)
goto next_with_ready;
if (_startup_complete_check_is_ready (self, scd->sett_conn))
if (_startup_complete_check_is_ready (self, scd->sett_conn, FALSE))
goto next_with_ready;
scd_not_ready = scd;
@ -598,7 +600,7 @@ next_with_ready:
if (_LOGW_ENABLED ()) {
c_list_for_each_entry (scd, &priv->startup_complete_scd_lst_head, scd_lst) {
if (!_startup_complete_check_is_ready (self, scd->sett_conn)) {
if (!_startup_complete_check_is_ready (self, scd->sett_conn, TRUE)) {
_LOGW ("startup-complete: profile \"%s\" (%s) was waiting for non-existing device (with timeout \"connection.wait-device-timeout=%"G_GINT64_FORMAT"\")",
nm_settings_connection_get_id (scd->sett_conn),
nm_settings_connection_get_uuid (scd->sett_conn),