diff --git a/RHEL-102255-RHEL-102319-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch b/RHEL-102255-RHEL-102319-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch similarity index 100% rename from RHEL-102255-RHEL-102319-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch rename to RHEL-102255-RHEL-102319-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch diff --git a/RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch b/RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch new file mode 100644 index 0000000..634a894 --- /dev/null +++ b/RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch @@ -0,0 +1,49 @@ +From 54714646c6e2c4ba851e366e63316adb1092af61 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +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. + + Monitor sleep +- ++ + + + +@@ -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 847cde0..f01fd48 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.16.0 -Release: 33%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 34%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -82,7 +82,7 @@ Patch29: RHEL-88431-2-podman-etcd-remove-unused-actions-from-metadata.patch Patch30: RHEL-88431-3-podman-etcd-fix-listen-peer-urls-binding.patch Patch31: RHEL-113104-podman-etcd-add-oom-parameter.patch Patch32: RHEL-109013-powervs-move-ip-new-ra.patch -Patch33: RHEL-102255-RHEL-102319-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch +Patch33: RHEL-102255-RHEL-102319-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch Patch34: RHEL-113817-podman-etcd-wrap-ipv6-address-in-brackets.patch Patch35: RHEL-113816-podman-etcd-preserve-containers-for-debugging.patch Patch36: RHEL-116205-podman-etcd-add-cluster-wide-force_new_cluster-attribute-check.patch @@ -93,6 +93,7 @@ Patch40: RHEL-119504-podman-etcd-add-automatic-learner-member-promotion.patch Patch41: RHEL-115495-db2-use-reintegration-flag-to-avoid-race-condition-on-cluster-reintegration.patch Patch42: RHEL-124203-podman-etcd-certificate-rotation.patch Patch43: RHEL-124206-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex.patch +Patch44: RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -307,6 +308,7 @@ exit 1 %patch -p1 -P 41 %patch -p1 -P 42 %patch -p1 -P 43 +%patch -p1 -P 44 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -639,6 +641,14 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Oct 29 2025 Oyvind Albrigtsen - 4.16.0-34 +- db2: add "skip_basic_sql_health_check" parameter to avoid failing on + systems with high load +- db2: add "monitor_retries", "monitor_sleep", and "monitor_retry_all_errors" + parameters to be able to avoid failing on first try + + Resolves: RHEL-102255, RHEL-102319 + * Tue Oct 28 2025 Oyvind Albrigtsen - 4.16.0-33 - podman-etcd: add support for cert rotation - podman-etcd: compute dynamic revision bump from maxRaftIndex @@ -672,14 +682,6 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents Resolves: RHEL-113817, RHEL-113816, RHEL-116205, RHEL-116202 -* Thu Sep 18 2025 Oyvind Albrigtsen - 4.16.0-25 -- db2: add "skip_basic_sql_health_check" parameter to avoid failing on - systems with high load -- db2: add "monitor_retries", "monitor_sleep", and "monitor_retry_all_errors" - parameters to be able to avoid failing on first try - - Resolves: RHEL-102255, RHEL-102319 - * Mon Sep 15 2025 Oyvind Albrigtsen - 4.16.0-24 - powervs-move-ip: new resource agent