From 3f75ae39582fc9b00e6d3b6c4e7a50163763b5bc Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 30 Apr 2024 16:35:32 +0200 Subject: [PATCH] - AWS agents: retry failed metadata requests to avoid instantly failing when there is a hiccup in the network or metadata service Resolves: RHEL-16246 --- RHEL-16246-aws-agents-use-curl_retry.patch | 12 ++++++------ resource-agents.spec | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RHEL-16246-aws-agents-use-curl_retry.patch b/RHEL-16246-aws-agents-use-curl_retry.patch index 1e1cd4a..9f035a7 100644 --- a/RHEL-16246-aws-agents-use-curl_retry.patch +++ b/RHEL-16246-aws-agents-use-curl_retry.patch @@ -53,7 +53,7 @@ index c5edb6f57..a69a9743d 100644 # run crm_mon without any cib schema validation # This is useful when an agent runs in a bundle to avoid potential -From 0cfceca66b6497abce3bd40919cfe29e2be590b7 Mon Sep 17 00:00:00 2001 +From 80d330557319bdae9e45aad1279e435fc481d4e7 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 6 Feb 2024 13:28:25 +0100 Subject: [PATCH 2/2] AWS agents: use curl_retry() @@ -200,7 +200,7 @@ index 18ab157e8..eba2ed95c 100644 IPADDRESS="${OCF_RESKEY_ip}";; esac diff --git a/heartbeat/awseip b/heartbeat/awseip -index 49b0ca615..1a977b762 100755 +index 49b0ca615..ffb6223a1 100755 --- a/heartbeat/awseip +++ b/heartbeat/awseip @@ -49,12 +49,16 @@ OCF_RESKEY_auth_type_default="key" @@ -258,10 +258,10 @@ index 49b0ca615..1a977b762 100755 + NETWORK_ID=$(curl_retry "$OCF_RESKEY_curl_retries" "$OCF_RESKEY_curl_sleep" "-s -H 'X-aws-ec2-metadata-token: $TOKEN'" "http://169.254.169.254/latest/meta-data/network/interfaces/macs/${MAC%/*}/interface-id") fi done -+ if [ -z "$NETWORK_ID" ]; then -+ ocf_exit_reason "Could not find network interface for private_ip_address: $PRIVATE_IP_ADDRESS" -+ exit $OCF_ERR_GENERIC -+ fi ++ if [ -z "$NETWORK_ID" ]; then ++ ocf_exit_reason "Could not find network interface for private_ip_address: $PRIVATE_IP_ADDRESS" ++ exit $OCF_ERR_GENERIC ++ fi $AWSCLI_CMD ec2 associate-address \ --network-interface-id ${NETWORK_ID} \ --allocation-id ${ALLOCATION_ID} \ diff --git a/resource-agents.spec b/resource-agents.spec index 82fc963..42a088f 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 55%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 56%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -637,7 +637,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Mon Apr 29 2024 Oyvind Albrigtsen - 4.10.0-55 +* Tue Apr 30 2024 Oyvind Albrigtsen - 4.10.0-56 - AWS agents: retry failed metadata requests to avoid instantly failing when there is a hiccup in the network or metadata service