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

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

Browse Source 
curl_retry()

  Resolves: RHEL-102728
This commit is contained in:
Oyvind Albrigtsen 2025-07-14 10:53:13 +02:00
parent 60ba8a99de
commit 13dfbcd490
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-102728-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

@ -45,7 +45,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0 Version: 4.16.0
Release: 20%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 21%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -76,6 +76,7 @@ Patch23: RHEL-93680-IPaddr2-IPsrcaddr-avoid-duplicate-route-issues.patch
Patch24: RHEL-85014-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch Patch24: RHEL-85014-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch
Patch25: RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch Patch25: RHEL-99743-Filesystem-remove-validate-all-fstype-check.patch
Patch26: RHEL-97216-Filesystem-fix-issue-with-Vormetric-mounts.patch Patch26: RHEL-97216-Filesystem-fix-issue-with-Vormetric-mounts.patch
Patch27: RHEL-102728-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch Patch500: ha-cloud-support-aliyun.patch
@ -261,6 +262,7 @@ exit 1
%patch -p1 -P 24 %patch -p1 -P 24
%patch -p1 -P 25 %patch -p1 -P 25
%patch -p1 -P 26 %patch -p1 -P 26
%patch -p1 -P 27
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
%patch -p1 -P 500 %patch -p1 -P 500
@ -591,6 +593,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog %changelog
* Mon Jul 14 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-21
- ocf-shellfuncs/AWS agent: dont sleep after the final try in
curl_retry()
Resolves: RHEL-102728
* Thu Jul 3 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-20 * Thu Jul 3 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-20
- Filesystem: fix issue with Vormetric mounts - Filesystem: fix issue with Vormetric mounts