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

- db2: use -l forever to fix crm_attribute issue

Browse Source 
Resolves: rhbz#2029704
This commit is contained in:
Oyvind Albrigtsen 2022-02-23 16:51:26 +01:00
parent 2c465644f6
commit fa593eb6d9
3 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bz2029704-db2-crm_attribute-use-forever.patch → bz2029704-1-db2-crm_attribute-use-forever.patch
View File

32
bz2029704-2-db2-fixes.patch Normal file
View File

@ -0,0 +1,32 @@
From 75eaf06eea8957aa3941823955d1c8fa7933ab1d Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 23 Feb 2022 16:32:21 +0100
Subject: [PATCH] db2: only warn when notify isnt set, and use
ocf_local_nodename() to get node name
---
heartbeat/db2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/heartbeat/db2 b/heartbeat/db2
index fa2a45a5d..ea24d33fc 100755
--- a/heartbeat/db2
+++ b/heartbeat/db2
@@ -267,7 +267,7 @@ db2_fal_attrib() {
case "$2" in
set)
- me=$(uname -n)
+ me=$(ocf_local_nodename)
# loop over all member nodes and set attribute
crm_node -l |
@@ -284,7 +284,7 @@ db2_fal_attrib() {
get)
crm_attribute -l forever -n $attr -G --quiet 2>&1
rc=$?
- if [ $rc != 0 ]
+ if ! ocf_is_true "$OCF_RESKEY_CRM_meta_notify" && [ $rc != 0 ]
then
ocf_log warn "DB2 instance $instance($db2node/$db: can't retrieve attribute $attr, are you sure notifications are enabled ?"
fi

17
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 7%{?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
@ -54,9 +54,10 @@ Patch1: bz1952005-pgsqlms-new-ra.patch
Patch2: bz2021125-gcp-ilb-1-fix-log_enable.patch
Patch3: bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
Patch4: bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch
Patch5: bz2029704-db2-crm_attribute-use-forever.patch
Patch6: bz2029753-podman-remove-anonymous-volumes.patch
Patch7: bz2055016-IPsrcaddr-dhcp-warning.patch
Patch5: bz2029704-1-db2-crm_attribute-use-forever.patch
Patch6: bz2029704-2-db2-fixes.patch
Patch7: bz2029753-podman-remove-anonymous-volumes.patch
Patch8: bz2055016-IPsrcaddr-dhcp-warning.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aws.patch
@ -188,6 +189,7 @@ exit 1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# bundled ha-cloud-support libs
%patch500 -p1
@ -517,6 +519,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Wed Feb 23 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-7
- db2: use -l forever to fix crm_attribute issue
Resolves: rhbz#2029704
* Wed Feb 16 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-6
- IPsrcaddr: add warning about possible issues when used with DHCP
@ -530,10 +537,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
* Tue Dec 7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-4
- Route: return OCF_NOT_RUNNING for probe action when interface
or route doesnt exist
- db2: use -l forever to fix crm_attribute issue
Resolves: rhbz#2029796
Resolves: rhbz#2029704
* Tue Nov 9 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-3
- gcp-ilb: new resource agent