From 64a054ec5d6834fac5af4511fedd7f7d709fe7ea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 12 Jan 2023 03:28:14 -0500
Subject: [PATCH] import resource-agents-4.9.0-29.el8_7.3

---
 ...44866-vdo-vol-dont-fail-probe-action.patch | 27 +++++++++++++++++++
 SPECS/resource-agents.spec                    | 10 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/bz2144866-vdo-vol-dont-fail-probe-action.patch

diff --git a/SOURCES/bz2144866-vdo-vol-dont-fail-probe-action.patch b/SOURCES/bz2144866-vdo-vol-dont-fail-probe-action.patch
new file mode 100644
index 0000000..28c28ce
--- /dev/null
+++ b/SOURCES/bz2144866-vdo-vol-dont-fail-probe-action.patch
@@ -0,0 +1,27 @@
+From 739e6ce9096facd6d37dffd524c79c961e3fae38 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 11 Nov 2022 14:17:39 +0100
+Subject: [PATCH] vdo-vol: dont fail probe action when the underlying device
+ doesnt exist
+
+---
+ heartbeat/vdo-vol | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/heartbeat/vdo-vol b/heartbeat/vdo-vol
+index 94822cb82..29bd7b8fd 100755
+--- a/heartbeat/vdo-vol
++++ b/heartbeat/vdo-vol
+@@ -148,6 +148,12 @@ vdo_monitor(){
+ 	MODE=$(vdostats --verbose ${OCF_RESKEY_volume} | grep "operating mode" | awk '{print $NF}')
+ 
+ 	case "$status" in
++		*"ERROR - vdodumpconfig: Failed to make FileLayer from"*)
++			if ocf_is_probe; then
++			    return $OCF_NOT_RUNNING
++			fi
++			return $OCF_ERR_GENERIC
++			;;
+ 		*"Device mapper status: not available"*)
+ 			return $OCF_NOT_RUNNING
+ 			;;
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 038dced..fc41590 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -69,7 +69,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	29%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
+Release:	29%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.3
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -122,6 +122,7 @@ Patch30:	bz2090370-CTDB-move-process-to-root-cgroup-if-rt-enabled.patch
 Patch31:	bz2116941-ethmonitor-ovsmonitor-pgsql-fix-attrd_updater-q.patch
 Patch32:	bz2130986-azure-events-az-new-ra.patch
 Patch33:	bz2134536-IPsrcaddr-proto-metric-scope-default-route-fixes.patch
+Patch34:	bz2144866-vdo-vol-dont-fail-probe-action.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -335,6 +336,7 @@ exit 1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -910,6 +912,12 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Tue Nov 22 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-29.3
+- vdo-vol: dont fail probe action when the underlying device doesnt
+  exist
+
+  Resolves: rhbz#2144866
+
 * Fri Oct 14 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-29.2
 - IPsrcaddr: proto, metric, scope and default route fixes