diff --git a/RHEL-102727-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch b/RHEL-102727-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch new file mode 100644 index 0000000..3dd9bbf --- /dev/null +++ b/RHEL-102727-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch @@ -0,0 +1,24 @@ +From d5fbb84496501c7da75cad992e027700823edf65 Mon Sep 17 00:00:00 2001 +From: adamaze +Date: Mon, 30 Jun 2025 15:55:50 -0500 +Subject: [PATCH] Update ocf-shellfuncs.in + +--- + heartbeat/ocf-shellfuncs.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in +index cb4d5cacc..526be42b6 100644 +--- a/heartbeat/ocf-shellfuncs.in ++++ b/heartbeat/ocf-shellfuncs.in +@@ -708,7 +708,9 @@ curl_retry() + [ $? -ne 0 ] && exit $OCF_ERR_GENERIC + args=$(echo "$args" | sed "s/$OLD_TOKEN/$TOKEN/") + fi +- sleep $sleep ++ if [ $try -lt $tries ]; then ++ sleep $sleep ++ fi + done + + if [ $rc -ne 0 ]; then diff --git a/resource-agents.spec b/resource-agents.spec index f7c3626..e842f43 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: 78%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 79%{?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 @@ -162,6 +162,7 @@ Patch109: RHEL-88429-3-podman-etcd-fix-listen-peer-urls-binding.patch Patch110: RHEL-70044-IPaddr2-IPsrcaddr-avoid-duplicate-route-issues.patch Patch111: RHEL-7688-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch Patch112: RHEL-97123-Filesystem-fix-issue-with-Vormetric-mounts.patch +Patch113: RHEL-102727-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -398,6 +399,7 @@ exit 1 %patch -p1 -P 110 %patch -p1 -P 111 %patch -p1 -P 112 +%patch -p1 -P 113 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -727,6 +729,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon Jul 14 2025 Oyvind Albrigtsen - 4.10.0-79 +- ocf-shellfuncs/AWS agent: dont sleep after the final try in + curl_retry() + + Resolves: RHEL-102727 + * Thu Jul 3 2025 Oyvind Albrigtsen - 4.10.0-78 - Filesystem: fix issue with Vormetric mounts