From 21774a59b54365d272b7815c08763449a140856d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 11 Jan 2022 13:48:11 -0500
Subject: [PATCH] import resource-agents-4.10.0-4.el9

---
 ...029704-db2-crm_attribute-use-forever.patch | 32 ++++++++++++++
 ...return-OCF_NOT_RUNNING-missing-route.patch | 43 +++++++++++++++++++
 SPECS/resource-agents.spec                    | 22 +++++++---
 3 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 SOURCES/bz2029704-db2-crm_attribute-use-forever.patch
 create mode 100644 SOURCES/bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch

diff --git a/SOURCES/bz2029704-db2-crm_attribute-use-forever.patch b/SOURCES/bz2029704-db2-crm_attribute-use-forever.patch
new file mode 100644
index 0000000..17f26c8
--- /dev/null
+++ b/SOURCES/bz2029704-db2-crm_attribute-use-forever.patch
@@ -0,0 +1,32 @@
+From 925180da2f41feddc5aac3c249563eb179b34029 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 22 Nov 2021 16:44:48 +0100
+Subject: [PATCH] db2: use -l forever instead of -t nodes -l reboot, as they
+ conflict with eachother
+
+---
+ heartbeat/db2 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/heartbeat/db2 b/heartbeat/db2
+index 03146a957..fa2a45a5d 100755
+--- a/heartbeat/db2
++++ b/heartbeat/db2
+@@ -274,7 +274,7 @@ db2_fal_attrib() {
+         while read id node member
+         do
+             [ "$member" = member -a "$node" != "$me" ] || continue
+-            crm_attribute -t nodes -l reboot --node=$node -n $attr -v "$3"
++            crm_attribute -l forever --node=$node -n $attr -v "$3"
+             rc=$?
+             ocf_log info "DB2 instance $instance($db2node/$db: setting attrib for FAL to $FIRST_ACTIVE_LOG @ $node"
+             [ $rc != 0 ] && break
+@@ -282,7 +282,7 @@ db2_fal_attrib() {
+         ;;
+ 
+         get)
+-        crm_attribute -t nodes -l reboot -n $attr -G --quiet 2>&1
++        crm_attribute -l forever -n $attr -G --quiet 2>&1
+         rc=$?
+         if [ $rc != 0 ]
+         then
diff --git a/SOURCES/bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch b/SOURCES/bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch
new file mode 100644
index 0000000..53d3299
--- /dev/null
+++ b/SOURCES/bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch
@@ -0,0 +1,43 @@
+From 7c54e4ecda33c90a1046c0688774f5b847ab10fe Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 7 Dec 2021 10:37:24 +0100
+Subject: [PATCH] Route: return OCF_NOT_RUNNING for probe action when interface
+ or route doesnt exist
+
+---
+ heartbeat/Route | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/heartbeat/Route b/heartbeat/Route
+index 8b390615a..7db41d0ae 100755
+--- a/heartbeat/Route
++++ b/heartbeat/Route
+@@ -227,15 +227,6 @@ route_stop() {
+ }
+ 
+ route_status() {
+-    if [ -n "${OCF_RESKEY_device}" ]; then
+-	# Must check if device exists or is gone.
+-	# If device is gone, route is also unconfigured.
+-	ip link show dev ${OCF_RESKEY_device} >/dev/null 2>&1
+-	if [ $? -ne 0 ]; then
+-	    # Assume device does not exist, and short-circuit here.
+-	    return $OCF_NOT_RUNNING
+-	fi
+-    fi
+     show_output="$(ip $addr_family route show $(create_route_spec) 2>/dev/null)"
+     if [ $? -eq 0 ]; then
+ 	if [ -n "$show_output" ]; then
+@@ -251,7 +242,11 @@ route_status() {
+     else
+ 	# "ip route show" returned an error code. Assume something
+ 	# went wrong.
+-	return $OCF_ERR_GENERIC
++	if ocf_is_probe; then
++	    return $OCF_NOT_RUNNING
++	else
++	    return $OCF_ERR_GENERIC
++	fi
+     fi
+ }
+ 
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 6b2eece..4ce05ee 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -45,14 +45,16 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	4%{?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
-Patch0:		nova-compute-wait-NovaEvacuate.patch
-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
+Patch0: 	nova-compute-wait-NovaEvacuate.patch
+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
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -180,6 +182,8 @@ exit 1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -509,6 +513,14 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* 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