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

platform: add a retry mechanism in case route dump fails

Browse source 
In case the platform fails dumping a specific route protocol, retry
multiple times. If all attempts fail, emit a warning and proceed as
there is nothing more to do.
This commit is contained in:
Beniamino Galvani 2024-07-29 14:21:00 +02:00 • committed by Íñigo Huguet
parent b2635d3461
commit 7efab8baeb
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libnm-platform/nm-linux-platform.c
View file

@ -7940,11 +7940,17 @@ do_request_all_no_delayed_actions(NMPlatform *platform, DelayedActionType action
struct rtmsg rtm = { struct rtmsg rtm = {
.rtm_family = refresh_all_info->addr_family_for_dump, .rtm_family = refresh_all_info->addr_family_for_dump,
}; };
guint retry_count = 0;
guint i; guint i;
for (i = 0; i < G_N_ELEMENTS(ip_route_tracked_protocols); i++) { for (i = 0; i < G_N_ELEMENTS(ip_route_tracked_protocols); i++) {
nm_auto_nlmsg struct nl_msg *nlmsg = NULL; nm_auto_nlmsg struct nl_msg *nlmsg = NULL;
if (retry_count > 0) {
/* Try again previous protocol */
i--;
}
/* If we try to request a new dump while the previous is still /* If we try to request a new dump while the previous is still
* in progress, kernel returns -EBUSY. Complete the previous * in progress, kernel returns -EBUSY. Complete the previous
* dump by reading from the socket. */ * dump by reading from the socket. */
@ -7970,7 +7976,17 @@ do_request_all_no_delayed_actions(NMPlatform *platform, DelayedActionType action
out_refresh_all_in_progress) out_refresh_all_in_progress)
< 0) { < 0) {
*out_refresh_all_in_progress -= 1; *out_refresh_all_in_progress -= 1;
/* Try to refresh other route protocols ... */ retry_count++;
if (retry_count > 4) {
_LOGW("failed dumping IPv%c routes with protocol %u, cache might be "
"inconsistent",
nm_utils_addr_family_to_char(rtm.rtm_family),
rtm.rtm_protocol);
retry_count = 0;
/* Give up and try the next protocol */
}
} else {
retry_count = 0;
} }
} }
} else { } else {