From 25b1a1c70b0beb332d55832836fdb7f8fdedffa4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 4 Sep 2024 20:19:58 +0000 Subject: [PATCH] import UBI NetworkManager-1.46.0-19.el9_4 --- ...-resolution-when-it-fails-rhel-55397.patch | 338 ++++++++++++++++++ ...low-bigger-restart-bursts-rhel-56739.patch | 46 +++ ...ces-primary-address-first-rhel-56386.patch | 141 ++++++++ SPECS/NetworkManager.spec | 10 +- 4 files changed, 534 insertions(+), 1 deletion(-) create mode 100644 SOURCES/1018-retry-hostname-resolution-when-it-fails-rhel-55397.patch create mode 100644 SOURCES/1019-cloud-setup-allow-bigger-restart-bursts-rhel-56739.patch create mode 100644 SOURCES/1020-cloud-setup-ensure-azure-places-primary-address-first-rhel-56386.patch diff --git a/SOURCES/1018-retry-hostname-resolution-when-it-fails-rhel-55397.patch b/SOURCES/1018-retry-hostname-resolution-when-it-fails-rhel-55397.patch new file mode 100644 index 0000000..8134b00 --- /dev/null +++ b/SOURCES/1018-retry-hostname-resolution-when-it-fails-rhel-55397.patch @@ -0,0 +1,338 @@ +From 8f5767448c3d1ab3748d1d4db98286254f7ad241 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 31 Jul 2024 17:08:43 +0200 +Subject: [PATCH] policy: retry hostname resolution when it fails + +Currently if the system hostname can't be determined, NetworkManager +only retries when something changes: a new address is added, the DHCP +lease changes, etc. + +However, it might happen that the current failure in looking up the +hostname is caused by an external factor, like a temporary outage of +the DNS server. + +Add a mechanism to retry the resolution with an increasing timeout. + +https://issues.redhat.com/browse/RHEL-17972 +(cherry picked from commit 04ad4c86d0e943b1f39d059aafa0c690708293e8) +(cherry picked from commit 3555dbd2f2177fe9db9c016431e284d88e08d7cd) +(cherry picked from commit 7ae0f3edf06fffee0c642b09741c5df867c5bb10) +--- + src/core/nm-policy.c | 139 ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 117 insertions(+), 22 deletions(-) + +diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c +index 9777cf326f..db588db7d6 100644 +--- a/src/core/nm-policy.c ++++ b/src/core/nm-policy.c +@@ -48,6 +48,10 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMPolicy, + PROP_ACTIVATING_IP4_AC, + PROP_ACTIVATING_IP6_AC, ); + ++#define HOSTNAME_RETRY_INTERVAL_MIN 30U ++#define HOSTNAME_RETRY_INTERVAL_MAX (60U * 60 * 12) /* 12 hours */ ++#define HOSTNAME_RETRY_INTERVAL_MULTIPLIER 8U ++ + typedef struct { + NMManager *manager; + NMNetns *netns; +@@ -79,14 +83,21 @@ typedef struct { + char *orig_hostname; /* hostname at NM start time */ + char *cur_hostname; /* hostname we want to assign */ + char *cur_hostname_full; /* similar to @last_hostname, but before shortening */ +- char * +- last_hostname; /* last hostname NM set (to detect if someone else changed it in the meanwhile) */ ++ char *last_hostname; /* last hostname NM set (to detect if someone else ++ * changed it in the meanwhile) */ ++ struct { ++ GSource *source; ++ guint interval_sec; ++ gboolean do_restart; /* when something changes, set this to TRUE so that the next retry ++ * will restart from the lowest timeout. */ ++ } hostname_retry; + + bool changing_hostname : 1; /* hostname set operation in progress */ + bool dhcp_hostname : 1; /* current hostname was set from dhcp */ + bool updating_dns : 1; + + GArray *ip6_prefix_delegations; /* pool of ip6 prefixes delegated to all devices */ ++ + } NMPolicyPrivate; + + struct _NMPolicy { +@@ -135,9 +146,10 @@ _PRIV_TO_SELF(NMPolicyPrivate *priv) + + /*****************************************************************************/ + +-static void update_system_hostname(NMPolicy *self, const char *msg); +-static void nm_policy_device_recheck_auto_activate_all_schedule(NMPolicy *self); ++static void update_system_hostname(NMPolicy *self, const char *msg, gboolean reset_retry_interval); ++static void nm_policy_device_recheck_auto_activate_all_schedule(NMPolicy *self); + static NMDevice *get_default_device(NMPolicy *self, int addr_family); ++static gboolean hostname_retry_cb(gpointer user_data); + + /*****************************************************************************/ + +@@ -558,7 +570,56 @@ _get_hostname(NMPolicy *self) + } + + static void +-_set_hostname(NMPolicy *self, const char *new_hostname, const char *msg) ++hostname_retry_schedule(NMPolicy *self) ++{ ++ NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); ++ ++ if (priv->hostname_retry.source && !priv->hostname_retry.do_restart) ++ return; ++ ++ nm_clear_g_source_inst(&priv->hostname_retry.source); ++ ++ if (priv->hostname_retry.do_restart) ++ priv->hostname_retry.interval_sec = 0; ++ ++ priv->hostname_retry.interval_sec *= HOSTNAME_RETRY_INTERVAL_MULTIPLIER; ++ priv->hostname_retry.interval_sec = NM_CLAMP(priv->hostname_retry.interval_sec, ++ HOSTNAME_RETRY_INTERVAL_MIN, ++ HOSTNAME_RETRY_INTERVAL_MAX); ++ ++ _LOGT(LOGD_DNS, ++ "hostname-retry: schedule in %u seconds%s", ++ priv->hostname_retry.interval_sec, ++ priv->hostname_retry.do_restart ? " (restarted)" : ""); ++ priv->hostname_retry.source = ++ nm_g_timeout_add_seconds_source(priv->hostname_retry.interval_sec, hostname_retry_cb, self); ++ ++ priv->hostname_retry.do_restart = FALSE; ++} ++ ++static gboolean ++hostname_retry_cb(gpointer user_data) ++{ ++ NMPolicy *self = NM_POLICY(user_data); ++ NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); ++ const CList *tmp_lst; ++ NMDevice *device; ++ ++ _LOGT(LOGD_DNS, "hostname-retry: timeout"); ++ ++ nm_clear_g_source_inst(&priv->hostname_retry.source); ++ ++ /* Clear any cached DNS results before retrying */ ++ nm_manager_for_each_device (priv->manager, device, tmp_lst) { ++ nm_device_clear_dns_lookup_data(device, "hostname retry timeout"); ++ } ++ update_system_hostname(self, "hostname retry timeout", FALSE); ++ ++ return G_SOURCE_CONTINUE; ++} ++ ++static void ++_set_hostname(NMPolicy *self, const char *new_hostname, const char *msg, gboolean do_retry) + { + NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); + gs_free char *old_hostname = NULL; +@@ -612,6 +673,15 @@ _set_hostname(NMPolicy *self, const char *new_hostname, const char *msg) + priv->updating_dns = FALSE; + } + ++ if (!do_retry) { ++ _LOGT(LOGD_DNS, "hostname-retry: clear"); ++ nm_clear_g_source_inst(&priv->hostname_retry.source); ++ priv->hostname_retry.interval_sec = 0; ++ priv->hostname_retry.do_restart = FALSE; ++ } else if (!priv->hostname_retry.source) { ++ hostname_retry_schedule(self); ++ } ++ + /* Finally, set kernel hostname */ + nm_assert(!priv->cur_hostname || priv->cur_hostname[0]); + name = priv->cur_hostname ?: FALLBACK_HOSTNAME4; +@@ -797,7 +867,7 @@ device_dns_lookup_done(NMDevice *device, gpointer user_data) + + g_signal_handlers_disconnect_by_func(device, device_dns_lookup_done, self); + +- update_system_hostname(self, "lookup finished"); ++ update_system_hostname(self, "lookup finished", FALSE); + } + + static void +@@ -810,12 +880,28 @@ device_carrier_changed(NMDevice *device, GParamSpec *pspec, gpointer user_data) + if (nm_device_has_carrier(device)) { + g_signal_handlers_disconnect_by_func(device, device_carrier_changed, priv); + msg = g_strdup_printf("device '%s' got carrier", nm_device_get_iface(device)); +- update_system_hostname(self, msg); ++ update_system_hostname(self, msg, TRUE); + } + } + ++/* ++ * This function evaluates different sources (static configuration, DHCP, DNS, ...) ++ * to set the system hostname. ++ * ++ * When the function needs to perform a blocking action like a DNS resolution, it ++ * subscribes to a signal for the completion event, registering a callback that ++ * invokes this function again. In the new invocation, any previous DNS result is ++ * cached and doesn't need a new resolution. ++ * ++ * In case no hostname is found when after sources have been evaluated, it schedules ++ * a timer to retry later with an interval that is increased at each attempt. When ++ * this function is called after something changed (for example, carrier went up, a ++ * new address was added), @reset_retry_interval should be set to TRUE so that the ++ * next retry will use the smallest interval. In this way, it can quickly adapt to ++ * temporary misconfigurations at boot or when the network environment changes. ++ */ + static void +-update_system_hostname(NMPolicy *self, const char *msg) ++update_system_hostname(NMPolicy *self, const char *msg, gboolean reset_retry_interval) + { + NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); + const char *configured_hostname; +@@ -830,6 +916,9 @@ update_system_hostname(NMPolicy *self, const char *msg) + + g_return_if_fail(self != NULL); + ++ if (reset_retry_interval) ++ priv->hostname_retry.do_restart = TRUE; ++ + if (priv->hostname_mode == NM_POLICY_HOSTNAME_MODE_NONE) { + _LOGT(LOGD_DNS, "set-hostname: hostname is unmanaged"); + return; +@@ -872,7 +961,7 @@ update_system_hostname(NMPolicy *self, const char *msg) + /* Try a persistent hostname first */ + configured_hostname = nm_hostname_manager_get_static_hostname(priv->hostname_manager); + if (configured_hostname && nm_utils_is_specific_hostname(configured_hostname)) { +- _set_hostname(self, configured_hostname, "from system configuration"); ++ _set_hostname(self, configured_hostname, "from system configuration", FALSE); + priv->dhcp_hostname = FALSE; + return; + } +@@ -909,7 +998,10 @@ update_system_hostname(NMPolicy *self, const char *msg) + if (dhcp_hostname && dhcp_hostname[0]) { + p = nm_str_skip_leading_spaces(dhcp_hostname); + if (p[0]) { +- _set_hostname(self, p, info->IS_IPv4 ? "from DHCPv4" : "from DHCPv6"); ++ _set_hostname(self, ++ p, ++ info->IS_IPv4 ? "from DHCPv4" : "from DHCPv6", ++ FALSE); + priv->dhcp_hostname = TRUE; + return; + } +@@ -937,7 +1029,7 @@ update_system_hostname(NMPolicy *self, const char *msg) + priv); + } + if (result) { +- _set_hostname(self, result, "from address lookup"); ++ _set_hostname(self, result, "from address lookup", FALSE); + return; + } + if (wait) { +@@ -952,8 +1044,10 @@ update_system_hostname(NMPolicy *self, const char *msg) + } + + /* If an hostname was set outside NetworkManager keep it */ +- if (external_hostname) ++ if (external_hostname) { ++ hostname_retry_schedule(self); + return; ++ } + + if (priv->hostname_mode == NM_POLICY_HOSTNAME_MODE_DHCP) { + /* In dhcp hostname-mode, the hostname is updated only if it comes from +@@ -962,7 +1056,7 @@ update_system_hostname(NMPolicy *self, const char *msg) + * so reset the hostname to the previous value + */ + if (priv->dhcp_hostname) { +- _set_hostname(self, priv->orig_hostname, "reset dhcp hostname"); ++ _set_hostname(self, priv->orig_hostname, "reset dhcp hostname", TRUE); + priv->dhcp_hostname = FALSE; + } + return; +@@ -974,11 +1068,11 @@ update_system_hostname(NMPolicy *self, const char *msg) + * set externally to NM + */ + if (priv->orig_hostname) { +- _set_hostname(self, priv->orig_hostname, "from system startup"); ++ _set_hostname(self, priv->orig_hostname, "from system startup", TRUE); + return; + } + +- _set_hostname(self, NULL, "no hostname found"); ++ _set_hostname(self, NULL, "no hostname found", TRUE); + } + + static void +@@ -1255,7 +1349,7 @@ update_routing_and_dns(NMPolicy *self, gboolean force_update, NMDevice *changed_ + update_ip6_routing(self, force_update); + + /* Update the system hostname */ +- update_system_hostname(self, "routing and dns"); ++ update_system_hostname(self, "routing and dns", FALSE); + + nm_dns_manager_end_updates(priv->dns_manager, __func__); + } +@@ -1572,7 +1666,7 @@ _static_hostname_changed_cb(NMHostnameManager *hostname_manager, + NMPolicyPrivate *priv = user_data; + NMPolicy *self = _PRIV_TO_SELF(priv); + +- update_system_hostname(self, "hostname changed"); ++ update_system_hostname(self, "hostname changed", FALSE); + } + + void +@@ -2217,7 +2311,7 @@ device_state_changed(NMDevice *device, + update_ip_dns(self, AF_INET6, device); + update_ip4_routing(self, TRUE); + update_ip6_routing(self, TRUE); +- update_system_hostname(self, "routing and dns"); ++ update_system_hostname(self, "routing and dns", TRUE); + nm_dns_manager_end_updates(priv->dns_manager, __func__); + + break; +@@ -2365,7 +2459,7 @@ device_l3cd_changed(NMDevice *device, + update_ip6_routing(self, TRUE); + /* FIXME: since we already monitor platform addresses changes, + * this is probably no longer necessary? */ +- update_system_hostname(self, "ip conf"); ++ update_system_hostname(self, "ip conf", FALSE); + } else { + nm_dns_manager_set_ip_config(priv->dns_manager, + AF_UNSPEC, +@@ -2387,7 +2481,7 @@ device_platform_address_changed(NMDevice *device, gpointer user_data) + + state = nm_device_get_state(device); + if (state > NM_DEVICE_STATE_DISCONNECTED && state < NM_DEVICE_STATE_DEACTIVATING) { +- update_system_hostname(self, "address changed"); ++ update_system_hostname(self, "address changed", TRUE); + } + } + +@@ -2726,7 +2820,7 @@ dns_config_changed(NMDnsManager *dns_manager, gpointer user_data) + nm_device_clear_dns_lookup_data(device, "DNS configuration changed"); + } + +- update_system_hostname(self, "DNS configuration changed"); ++ update_system_hostname(self, "DNS configuration changed", FALSE); + } + + nm_dispatcher_call_dns_change(); +@@ -2997,7 +3091,7 @@ constructed(GObject *object) + G_OBJECT_CLASS(nm_policy_parent_class)->constructed(object); + + _LOGD(LOGD_DNS, "hostname-mode: %s", _hostname_mode_to_string(priv->hostname_mode)); +- update_system_hostname(self, "initial hostname"); ++ update_system_hostname(self, "initial hostname", FALSE); + } + + NMPolicy * +@@ -3055,6 +3149,7 @@ dispose(GObject *object) + + nm_clear_g_source_inst(&priv->reset_connections_retries_idle_source); + nm_clear_g_source_inst(&priv->device_recheck_auto_activate_all_idle_source); ++ nm_clear_g_source_inst(&priv->hostname_retry.source); + + nm_clear_g_free(&priv->orig_hostname); + nm_clear_g_free(&priv->cur_hostname); +-- +2.46.0 + diff --git a/SOURCES/1019-cloud-setup-allow-bigger-restart-bursts-rhel-56739.patch b/SOURCES/1019-cloud-setup-allow-bigger-restart-bursts-rhel-56739.patch new file mode 100644 index 0000000..fd1f51d --- /dev/null +++ b/SOURCES/1019-cloud-setup-allow-bigger-restart-bursts-rhel-56739.patch @@ -0,0 +1,46 @@ +From 6016ef0813a6c048369cc27ae85fc12699bacab5 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Tue, 27 Aug 2024 00:29:17 +0200 +Subject: [PATCH] cloud-setup: allow bigger restart bursts + +On daemon startup, we may end up enqueueing many nm-cloud-setup.service +restarts in very a short time. That is perfectly fine, just bump the +thresholds so that systemd doesn't get in the way too quickly. + +100 requests in 1 seconds seem like a fair choice -- little bit on the +conservative side, yet still giving the service manager some room to +interfere on a chance things really go awry. + +https://issues.redhat.com/browse/RHEL-49694 +(cherry picked from commit 927cff9f178911b2a146259a89bfcc9727cbd8c3) +(cherry picked from commit 4dc35c72744f8820575ab0ea4638c4ddd880547d) +(cherry picked from commit 097dfdf711d2f968d0580839f5a7a54731c68f34) +--- + src/nm-cloud-setup/nm-cloud-setup.service.in | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/nm-cloud-setup/nm-cloud-setup.service.in b/src/nm-cloud-setup/nm-cloud-setup.service.in +index 4aa6017e48..10acf8add6 100644 +--- a/src/nm-cloud-setup/nm-cloud-setup.service.in ++++ b/src/nm-cloud-setup/nm-cloud-setup.service.in +@@ -8,6 +8,17 @@ After=NetworkManager.service + Type=oneshot + ExecStart=@libexecdir@/nm-cloud-setup + ++# The service restart gets triggered from dispatcher script ++# (pre-up and dhcp4-change actions), possibly ending up with many ++# restart requests at the same time (e.g. on initial daemon startup ++# on a machine with multiple NICs). The systemd handles multiple ++# concurrent restart requests gracefully (the newer requests supersede ++# older, which wait for them to finish), but the default limits are way ++# too low: 5 restarts in 10 seconds. Raise that high enough for us to ++# be on the safe side. ++StartLimitIntervalSec=1 ++StartLimitBurst=100 ++ + #Environment=NM_CLOUD_SETUP_LOG=TRACE + + # Cloud providers are disabled by default. You need to +-- +2.46.0 + diff --git a/SOURCES/1020-cloud-setup-ensure-azure-places-primary-address-first-rhel-56386.patch b/SOURCES/1020-cloud-setup-ensure-azure-places-primary-address-first-rhel-56386.patch new file mode 100644 index 0000000..1db2da0 --- /dev/null +++ b/SOURCES/1020-cloud-setup-ensure-azure-places-primary-address-first-rhel-56386.patch @@ -0,0 +1,141 @@ +From 81bba3f2321939bb9fd0200a91ac0bec79960732 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= +Date: Tue, 27 Aug 2024 12:08:16 +0200 +Subject: [PATCH] cloud-setup: azure: ensure that primary address is placed + first + +The primary address is that placed at position 0 of all the IP Addresses +of the interface. Sometimes we put it in a different position in the +ipv4s array because we insert them in the order we receive, but it might +happen that the HTTP responses comes back in wrong order. + +In order to solve this, we pass the index of the IPv4 address to the +callback and the address is added in the right position directly. + +Co-authored-by: Fernando Fernandez Mancera +(cherry picked from commit 72014db629cff33611ade58190d45a714efa1bbf) +(cherry picked from commit c976e212372da9683a1e2f8618e3bcfdf21d5e25) +(cherry picked from commit 55812963fde9519bb2752c46575a740fa0fea688) +--- + src/nm-cloud-setup/nmcs-provider-azure.c | 43 ++++++++++++++++-------- + 1 file changed, 29 insertions(+), 14 deletions(-) + +diff --git a/src/nm-cloud-setup/nmcs-provider-azure.c b/src/nm-cloud-setup/nmcs-provider-azure.c +index 771c43d9ad..78eda16cbb 100644 +--- a/src/nm-cloud-setup/nmcs-provider-azure.c ++++ b/src/nm-cloud-setup/nmcs-provider-azure.c +@@ -102,6 +102,11 @@ typedef struct { + guint n_iface_data_pending; + } AzureIfaceData; + ++typedef struct { ++ AzureIfaceData *iface_data; ++ guint64 ipaddress_idx; ++} AzureIpAddressReqData; ++ + static void + _azure_iface_data_destroy(AzureIfaceData *iface_data) + { +@@ -112,7 +117,8 @@ static void + _get_config_fetch_done_cb(NMHttpClient *http_client, + GAsyncResult *result, + AzureIfaceData *iface_data, +- GetConfigFetchType fetch_type) ++ GetConfigFetchType fetch_type, ++ guint64 ipaddress_idx) + { + NMCSProviderGetConfigTaskData *get_config_data; + NMCSProviderGetConfigIfaceData *iface_get_config; +@@ -149,9 +155,7 @@ _get_config_fetch_done_cb(NMHttpClient *http_client, + _LOGD("interface[%" G_GSSIZE_FORMAT "]: received address %s", + iface_data->intern_iface_idx, + nm_inet4_ntop(tmp_addr, tmp_addr_str)); +- iface_get_config->ipv4s_arr[iface_get_config->ipv4s_len] = tmp_addr; +- iface_get_config->has_ipv4s = TRUE; +- iface_get_config->ipv4s_len++; ++ iface_get_config->ipv4s_arr[ipaddress_idx] = tmp_addr; + break; + + case GET_CONFIG_FETCH_TYPE_IPV4_SUBNET_0_ADDRESS: +@@ -203,10 +207,14 @@ _get_config_fetch_done_cb_ipv4_ipaddress_x_privateipaddress(GObject *source + GAsyncResult *result, + gpointer user_data) + { ++ AzureIpAddressReqData *ipaddress_req_data = user_data; ++ + _get_config_fetch_done_cb(NM_HTTP_CLIENT(source), + result, +- user_data, +- GET_CONFIG_FETCH_TYPE_IPV4_IPADDRESS_X_PRIVATEIPADDRESS); ++ ipaddress_req_data->iface_data, ++ GET_CONFIG_FETCH_TYPE_IPV4_IPADDRESS_X_PRIVATEIPADDRESS, ++ ipaddress_req_data->ipaddress_idx); ++ g_free(ipaddress_req_data); + } + + static void +@@ -217,7 +225,8 @@ _get_config_fetch_done_cb_ipv4_subnet_0_address(GObject *source, + _get_config_fetch_done_cb(NM_HTTP_CLIENT(source), + result, + user_data, +- GET_CONFIG_FETCH_TYPE_IPV4_SUBNET_0_ADDRESS); ++ GET_CONFIG_FETCH_TYPE_IPV4_SUBNET_0_ADDRESS, ++ 0); + } + + static void +@@ -228,7 +237,8 @@ _get_config_fetch_done_cb_ipv4_subnet_0_prefix(GObject *source, + _get_config_fetch_done_cb(NM_HTTP_CLIENT(source), + result, + user_data, +- GET_CONFIG_FETCH_TYPE_IPV4_SUBNET_0_PREFIX); ++ GET_CONFIG_FETCH_TYPE_IPV4_SUBNET_0_PREFIX, ++ 0); + } + + static void +@@ -265,9 +275,10 @@ _get_config_ips_prefix_list_cb(GObject *source, GAsyncResult *result, gpointer u + nm_sprintf_buf(iface_idx_str, "%" G_GSSIZE_FORMAT, iface_data->intern_iface_idx); + + while (nm_utils_parse_next_line(&response_str, &response_len, &line, &line_len)) { +- gint64 ips_prefix_idx; +- gs_free char *uri = NULL; +- char buf[100]; ++ AzureIpAddressReqData *ipaddress_req_data; ++ gint64 ips_prefix_idx; ++ gs_free char *uri = NULL; ++ char buf[100]; + + if (line_len == 0) + continue; +@@ -284,8 +295,11 @@ _get_config_ips_prefix_list_cb(GObject *source, GAsyncResult *result, gpointer u + if (ips_prefix_idx < 0) + continue; + +- iface_data->n_iface_data_pending++; ++ ipaddress_req_data = g_new(AzureIpAddressReqData, 1); ++ ipaddress_req_data->iface_data = iface_data; ++ ipaddress_req_data->ipaddress_idx = ips_prefix_idx; + ++ iface_data->n_iface_data_pending++; + nm_http_client_poll_req( + NM_HTTP_CLIENT(source), + (uri = _azure_uri_interfaces(iface_idx_str, +@@ -302,11 +316,12 @@ _get_config_ips_prefix_list_cb(GObject *source, GAsyncResult *result, gpointer u + NULL, + NULL, + _get_config_fetch_done_cb_ipv4_ipaddress_x_privateipaddress, +- iface_data); ++ ipaddress_req_data); + } + +- iface_data->iface_get_config->ipv4s_len = 0; + iface_data->iface_get_config->ipv4s_arr = g_new(in_addr_t, iface_data->n_iface_data_pending); ++ iface_data->iface_get_config->has_ipv4s = TRUE; ++ iface_data->iface_get_config->ipv4s_len = iface_data->n_iface_data_pending; + + { + gs_free char *uri = NULL; +-- +2.46.0 + diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 93bad7c..17c7fd5 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -7,7 +7,7 @@ %global epoch_version 1 %global real_version 1.46.0 %global rpm_version %{real_version} -%global release_version 18 +%global release_version 19 %global snapshot %{nil} %global git_sha %{nil} %global bcond_default_debug 0 @@ -228,6 +228,9 @@ Patch1014: 1014-ovs-fix-triggering-stage3-without-dhcp-client-rhel-49799.patch Patch1015: 1015-policy-unblock-the-autoconnect-for-children-when-parent-is-available-rhel-53344.patch Patch1016: 1016-fix-lldp-crash-dereferencing-null-pointer-rhel-46200.patch Patch1017: 1017-use-etc-hosts-for-hostname-resolution-rhel-53202.patch +Patch1018: 1018-retry-hostname-resolution-when-it-fails-rhel-55397.patch +Patch1019: 1019-cloud-setup-allow-bigger-restart-bursts-rhel-56739.patch +Patch1020: 1020-cloud-setup-ensure-azure-places-primary-address-first-rhel-56386.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -1283,6 +1286,11 @@ fi %changelog +* Fri Aug 30 2024 Fernando Fernandez Mancera - 1:1.46.0-19 +- Retry hostname resolutions when it fails (RHEL-55397) +- cloud-setup: allow bigger restart bursts (RHEL-56739) +- cloud-setup: Fix Azure primary and secondary address swap (RHEL-56386) + * Tue Aug 20 2024 Fernando Fernandez Mancera - 1:1.46.0-18 - Fix crash dereferencing NULL pointer during debug logging (RHEL-46200) - Use /etc/hosts for hostname reesolution (RHEL-53202)