From 27828586ea991ab9fac9cf2b8416c5341a28eb76 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 30 Oct 2025 09:39:47 +0100
Subject: [PATCH] - db2: fix monitor_retries_sleep variable name

  Resolves: RHEL-124815
---
 RHEL-124815-db2-fix-variable-name.patch | 49 +++++++++++++++++++++++++
 resource-agents.spec                    |  9 ++++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 RHEL-124815-db2-fix-variable-name.patch

diff --git a/RHEL-124815-db2-fix-variable-name.patch b/RHEL-124815-db2-fix-variable-name.patch
new file mode 100644
index 0000000..634a894
--- /dev/null
+++ b/RHEL-124815-db2-fix-variable-name.patch
@@ -0,0 +1,49 @@
+From 54714646c6e2c4ba851e366e63316adb1092af61 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 28 Oct 2025 16:34:54 +0100
+Subject: [PATCH] db2: fix monitor_retries_sleep variable name
+
+---
+ heartbeat/db2 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/db2 b/heartbeat/db2
+index 83020fc70..82f2f82c3 100755
+--- a/heartbeat/db2
++++ b/heartbeat/db2
+@@ -49,7 +49,7 @@ fi
+ OCF_RESKEY_instance_default=""
+ OCF_RESKEY_skip_basic_sql_health_check_default="false"
+ OCF_RESKEY_monitor_retries_default="1"
+-OCF_RESKEY_monitor_sleep_default="1"
++OCF_RESKEY_monitor_retries_sleep_default="1"
+ OCF_RESKEY_monitor_retry_all_errors_default="false"
+ OCF_RESKEY_admin_default=""
+ OCF_RESKEY_dbpartitionnum_default="0"
+@@ -57,7 +57,7 @@ OCF_RESKEY_dbpartitionnum_default="0"
+ : ${OCF_RESKEY_instance=${OCF_RESKEY_instance_default}}
+ : ${OCF_RESKEY_skip_basic_sql_health_check=${OCF_RESKEY_skip_basic_sql_health_check_default}}
+ : ${OCF_RESKEY_monitor_retries=${OCF_RESKEY_monitor_retries_default}}
+-: ${OCF_RESKEY_monitor_sleep=${OCF_RESKEY_monitor_sleep_default}}
++: ${OCF_RESKEY_monitor_retries_sleep=${OCF_RESKEY_monitor_retries_sleep_default}}
+ : ${OCF_RESKEY_monitor_retry_all_errors=${OCF_RESKEY_monitor_retry_all_errors_default}}
+ : ${OCF_RESKEY_admin=${OCF_RESKEY_admin_default}}
+ : ${OCF_RESKEY_dbpartitionnum=${OCF_RESKEY_dbpartitionnum_default}}
+@@ -140,7 +140,7 @@ Monitor retries before failing.
+ Monitor sleep between tries.
+ </longdesc>
+ <shortdesc lang="en">Monitor sleep</shortdesc>
+-<content type="string" default="${OCF_RESKEY_monitor_sleep_default}" />
++<content type="string" default="${OCF_RESKEY_monitor_retries_sleep_default}" />
+ </parameter>
+ <parameter name="monitor_retry_all_errors" unique="0" required="0">
+ <longdesc lang="en">
+@@ -776,7 +776,7 @@ db2_monitor_retry() {
+         if [ $rc -eq $OCF_SUCCESS ] || [ $rc -eq $OCF_RUNNING_MASTER ] || [ $rc -eq $OCF_NOT_RUNNING ] || { [ $rc -ne 255 ] && ! ocf_is_true "$OCF_RESKEY_monitor_retry_all_errors" ;} ;then
+             break
+         fi
+-        [ $try -lt $tries ] && sleep $OCF_RESKEY_monitor_sleep
++        [ $try -lt $tries ] && sleep $OCF_RESKEY_monitor_retries_sleep
+     done
+ 
+     [ $rc -eq 255 ] && rc=$OCF_ERR_GENERIC
diff --git a/resource-agents.spec b/resource-agents.spec
index 198d555..d1b3ce0 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -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}.20
+Release:	54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.21
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -178,6 +178,7 @@ Patch81:	RHEL-118625-db2-use-reintegration-flag-to-avoid-race-condition-on-clust
 Patch82:	RHEL-116150-1-ocf-shellfuncs-add-ocf_promotion_score.patch
 Patch83:	RHEL-116150-2-portblock-add-promotable-support.patch
 Patch84:	RHEL-116150-3-portblock-fixes-add-method-and-status_check-parameters.patch
+Patch85:	RHEL-124815-db2-fix-variable-name.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -447,6 +448,7 @@ exit 1
 %patch -p1 -P 82
 %patch -p1 -P 83
 %patch -p1 -P 84
+%patch -p1 -P 85
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -1037,6 +1039,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Thu Oct 30 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.21
+- db2: fix monitor_retries_sleep variable name
+
+  Resolves: RHEL-124815
+
 * Tue Oct 21 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.20
 - portblock: add promotable support, and method and status_check
   parameters