rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- ocf-shellfuncs/AWS agents: dont sleep after the final try in

Browse Source 
curl_retry()

  Resolves: RHEL-102731
This commit is contained in:
Oyvind Albrigtsen 2025-07-15 11:58:27 +02:00
parent 6db69e67bd
commit e9df83e113
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RHEL-102731-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch Normal file
View File

@ -0,0 +1,24 @@
From d5fbb84496501c7da75cad992e027700823edf65 Mon Sep 17 00:00:00 2001
From: adamaze <adamaze@gmail.com>
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

10
resource-agents.spec
View File

@ -73,7 +73,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.9.0
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.13
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.15
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -172,6 +172,7 @@ Patch75: RHEL-81960-1-aws-agents-reuse-imds-token-until-it-expires.patch
Patch76: RHEL-81960-2-aws-agents-reuse-imds-token-improvements.patch
Patch77: RHEL-85048-tomcat-fix-CATALINA_PID-not-set-and-parameter-defaults.patch
Patch78: RHEL-91257-Filesystem-add-support-for-aznfs.patch
Patch79: RHEL-102731-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
@ -434,6 +435,7 @@ exit 1
%patch -p1 -P 76
%patch -p1 -P 77
%patch -p1 -P 78 -F2
%patch -p1 -P 79
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
@ -1023,6 +1025,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Jul 15 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.15
- ocf-shellfuncs/AWS agents: dont sleep after the final try in
curl_retry()
Resolves: RHEL-102731
* Wed May 14 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.13
- Filesystem: add support for aznfs