diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-08-13 10:09:09 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-13 10:15:39 +0200 |
| commit | d9568ca3ee810897633bbc05f4f01e416add8182 (patch) | |
| tree | 94bfa68568fd4a9564b6b4d8998065d6a577306b | |
| parent | 717b0f71e10021b62e1b11fbc1135767b57df882 (diff) | |
| download | NetworkManager-d9568ca3ee810897633bbc05f4f01e416add8182.tar.gz | |
settings: suppress wrong warning about wait-device-timeout for devices that are still busy
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: 3df662f534c4 ('settings: rework wait-device-timeout handling and consider device compatibility')
| -rw-r--r-- | src/settings/nm-settings.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 30930dd2b9..c86bf6c07e 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -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), |