From 733bfd4a85dce205ff2165ae812769f120a29258 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 29 Oct 2025 13:10:28 +0100 Subject: [PATCH] - 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-115785, RHEL-115782 --- ..._health_check-and-monitor-parameters.patch | 0 ...-RHEL-115782-2-db2-fix-variable-name.patch | 49 +++++++++++++++++++ resource-agents.spec | 22 +++++---- 3 files changed, 61 insertions(+), 10 deletions(-) rename RHEL-115785-RHEL-115782-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch => RHEL-115785-RHEL-115782-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch (100%) create mode 100644 RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch diff --git a/RHEL-115785-RHEL-115782-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch b/RHEL-115785-RHEL-115782-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch similarity index 100% rename from RHEL-115785-RHEL-115782-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch rename to RHEL-115785-RHEL-115782-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch diff --git a/RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch b/RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch new file mode 100644 index 0000000..634a894 --- /dev/null +++ b/RHEL-115785-RHEL-115782-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 5e8bbfc..e5c0234 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: 90%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 91%{?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 @@ -167,7 +167,7 @@ Patch114: RHEL-102610-podman-etcd-add-oom-parameter.patch Patch115: RHEL-42513-2-build-dont-build-powervs-subnet-if-dependencies-are-missing.patch Patch116: RHEL-114489-1-powervs-move-ip-new-ra.patch Patch117: RHEL-114489-2-powervs-move-ip-set-bundled-path.patch -Patch118: RHEL-115785-RHEL-115782-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch +Patch118: RHEL-115785-RHEL-115782-1-db2-add-skip_basic_sql_health_check-and-monitor-parameters.patch Patch119: RHEL-113767-podman-etcd-wrap-ipv6-address-in-brackets.patch Patch120: RHEL-113766-podman-etcd-preserve-containers-for-debugging.patch Patch121: RHEL-116206-podman-etcd-add-cluster-wide-force_new_cluster-attribute-check.patch @@ -178,6 +178,7 @@ Patch125: RHEL-119495-podman-etcd-add-automatic-learner-member-promotion.patch Patch126: RHEL-118624-db2-use-reintegration-flag-to-avoid-race-condition-on-cluster-reintegration.patch Patch127: RHEL-123887-podman-etcd-certificate-rotation.patch Patch128: RHEL-123906-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex.patch +Patch129: RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -451,6 +452,7 @@ exit 1 %patch -p1 -P 126 %patch -p1 -P 127 %patch -p1 -P 128 +%patch -p1 -P 129 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -783,6 +785,14 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Oct 29 2025 Oyvind Albrigtsen - 4.10.0-91 +- 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-115785, RHEL-115782 + * Tue Oct 28 2025 Oyvind Albrigtsen - 4.10.0-90 - podman-etcd: add support for cert rotation - podman-etcd: compute dynamic revision bump from maxRaftIndex @@ -814,14 +824,6 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents Resolves: RHEL-113767, RHEL-113766, RHEL-116206 -* Thu Sep 18 2025 Oyvind Albrigtsen - 4.10.0-84 -- 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-115785, RHEL-115782 - * Wed Sep 17 2025 Oyvind Albrigtsen - 4.10.0-83 - powervs-move-ip: new resource agent