- azure-events*: fix for no "Transition Summary" for Pacemaker 2.1+

- Filesystem: fail if AWS efs-utils not installed when fstype=efs

  Resolves: rhbz#2182415
  Resolves: rhbz#2183133

bz2182415-azure-events-1-fix-no-transition-summary.patch

@@ -0,0 +1,54 @@
+From 81bb58b05d2ddabd17fe31af39f0e857e61db3c9 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 28 Mar 2023 16:53:45 +0200
+Subject: [PATCH] azure-events*: fix for no "Transition Summary" for Pacemaker
+ 2.1+
+
+---
+ heartbeat/azure-events-az.in | 8 ++++----
+ heartbeat/azure-events.in    | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/heartbeat/azure-events-az.in b/heartbeat/azure-events-az.in
+index 59d0953061..67c02c6422 100644
+--- a/heartbeat/azure-events-az.in
++++ b/heartbeat/azure-events-az.in
+@@ -311,10 +311,10 @@ class clusterHelper:
+ 		summary = clusterHelper._exec("crm_simulate", "-Ls")
+ 		if not summary:
+ 			ocf.logger.warning("transitionSummary: could not load transition summary")
+-			return False
++			return ""
+ 		if summary.find("Transition Summary:") < 0:
+-			ocf.logger.warning("transitionSummary: received unexpected transition summary: %s" % summary)
+-			return False
++			ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
++			return ""
+ 		summary = summary.split("Transition Summary:")[1]
+ 		ret = summary.split("\n").pop(0)
+ 
+@@ -768,4 +768,4 @@ def main():
+ 	agent.run()
+ 
+ if __name__ == '__main__':
+-	main()
+\ No newline at end of file
++	main()
+diff --git a/heartbeat/azure-events.in b/heartbeat/azure-events.in
+index 66e129060a..5ad658df93 100644
+--- a/heartbeat/azure-events.in
++++ b/heartbeat/azure-events.in
+@@ -310,10 +310,10 @@ class clusterHelper:
+ 		summary = clusterHelper._exec("crm_simulate", "-Ls")
+ 		if not summary:
+ 			ocf.logger.warning("transitionSummary: could not load transition summary")
+-			return False
++			return ""
+ 		if summary.find("Transition Summary:") < 0:
+-			ocf.logger.warning("transitionSummary: received unexpected transition summary: %s" % summary)
+-			return False
++			ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
++			return ""
+ 		summary = summary.split("Transition Summary:")[1]
+ 		ret = summary.split("\n").pop(0)
+ 

bz2182415-azure-events-2-improve-logic.patch

@@ -0,0 +1,77 @@
+From ff53e5c8d6867e580506d132fba6fcf6aa46b804 Mon Sep 17 00:00:00 2001
+From: Peter Varkoly <varkoly@suse.com>
+Date: Sat, 29 Apr 2023 08:09:11 +0200
+Subject: [PATCH] Use -LS instead of -Ls as parameter to get the Transition
+ Summary
+
+---
+ heartbeat/azure-events-az.in | 9 +++++----
+ heartbeat/azure-events.in    | 9 +++++----
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/heartbeat/azure-events-az.in b/heartbeat/azure-events-az.in
+index 67c02c642..46d4d1f3d 100644
+--- a/heartbeat/azure-events-az.in
++++ b/heartbeat/azure-events-az.in
+@@ -298,7 +298,7 @@ class clusterHelper:
+ 		Get the current Pacemaker transition summary (used to check if all resources are stopped when putting a node standby)
+ 		"""
+ 		# <tniek> Is a global crm_simulate "too much"? Or would it be sufficient it there are no planned transitions for a particular node?
+-		# # crm_simulate -Ls
++		# # crm_simulate -LS
+ 		# 	Transition Summary:
+ 		# 	 * Promote rsc_SAPHana_HN1_HDB03:0      (Slave -> Master hsr3-db1)
+ 		# 	 * Stop    rsc_SAPHana_HN1_HDB03:1      (hsr3-db0)
+@@ -308,15 +308,16 @@ class clusterHelper:
+ 		# 	Transition Summary:
+ 		ocf.logger.debug("transitionSummary: begin")
+ 
+-		summary = clusterHelper._exec("crm_simulate", "-Ls")
++		summary = clusterHelper._exec("crm_simulate", "-LS")
+ 		if not summary:
+ 			ocf.logger.warning("transitionSummary: could not load transition summary")
+ 			return ""
+ 		if summary.find("Transition Summary:") < 0:
+ 			ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
+ 			return ""
+-		summary = summary.split("Transition Summary:")[1]
+-		ret = summary.split("\n").pop(0)
++		j=summary.find('Transition Summary:') + len('Transition Summary:')
++		l=summary.lower().find('executing cluster transition:')
++		ret = list(filter(str.strip, summary[j:l].split("\n")))
+ 
+ 		ocf.logger.debug("transitionSummary: finished; return = %s" % str(ret))
+ 		return ret
+diff --git a/heartbeat/azure-events.in b/heartbeat/azure-events.in
+index 5ad658df9..90acaba62 100644
+--- a/heartbeat/azure-events.in
++++ b/heartbeat/azure-events.in
+@@ -297,7 +297,7 @@ class clusterHelper:
+ 		Get the current Pacemaker transition summary (used to check if all resources are stopped when putting a node standby)
+ 		"""
+ 		# <tniek> Is a global crm_simulate "too much"? Or would it be sufficient it there are no planned transitions for a particular node?
+-		# # crm_simulate -Ls
++		# # crm_simulate -LS
+ 		# 	Transition Summary:
+ 		# 	 * Promote rsc_SAPHana_HN1_HDB03:0      (Slave -> Master hsr3-db1)
+ 		# 	 * Stop    rsc_SAPHana_HN1_HDB03:1      (hsr3-db0)
+@@ -307,15 +307,16 @@ class clusterHelper:
+ 		# 	Transition Summary:
+ 		ocf.logger.debug("transitionSummary: begin")
+ 
+-		summary = clusterHelper._exec("crm_simulate", "-Ls")
++		summary = clusterHelper._exec("crm_simulate", "-LS")
+ 		if not summary:
+ 			ocf.logger.warning("transitionSummary: could not load transition summary")
+ 			return ""
+ 		if summary.find("Transition Summary:") < 0:
+ 			ocf.logger.debug("transitionSummary: no transactions: %s" % summary)
+ 			return ""
+-		summary = summary.split("Transition Summary:")[1]
+-		ret = summary.split("\n").pop(0)
++		j=summary.find('Transition Summary:') + len('Transition Summary:')
++		l=summary.lower().find('executing cluster transition:')
++		ret = list(filter(str.strip, summary[j:l].split("\n")))
+ 
+ 		ocf.logger.debug("transitionSummary: finished; return = %s" % str(ret))
+ 		return ret

bz2183133-Filesystem-fail-efs-utils-not-installed.patch

@@ -0,0 +1,23 @@
+From b02b06c437b1d8cb1dcfe8ace47c2efc4a0e476c Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 30 Mar 2023 14:44:41 +0200
+Subject: [PATCH] Filesystem: fail if AWS efs-utils not installed when
+ fstype=efs
+
+---
+ heartbeat/Filesystem | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 65088029ec..50c68f115b 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -456,7 +456,7 @@ fstype_supported()
+ 	# System (EFS)
+ 	case "$FSTYPE" in
+ 		fuse.*|glusterfs|rozofs) support="fuse";;
+-		efs) support="nfs4";;
++		efs) check_binary "mount.efs"; support="nfs4";;
+ 	esac
+ 
+ 	if [ "$support" != "$FSTYPE" ]; then

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	36%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	37%{?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
@@ -98,6 +98,9 @@ Patch45:	bz2149968-lvmlockd-add-use_lvmlockd-if-missing.patch
 Patch46:	bz2174896-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
 Patch47:	bz2179003-mysql-replication-fixes.patch
 Patch48:	bz2174911-LVM-activate-failover-with-missing-pvs.patch
+Patch49:	bz2182415-azure-events-1-fix-no-transition-summary.patch
+Patch50:	bz2182415-azure-events-2-improve-logic.patch
+Patch51:	bz2183133-Filesystem-fail-efs-utils-not-installed.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -221,60 +224,63 @@ databases to be managed in a cluster environment.
 exit 1
 %endif
 %setup -q -n %{upstream_prefix}-%{upstream_version}
-%patch0 -p1 -F1
+%patch 0 -p1 -F1
-%patch1 -p1
+%patch 1 -p1
-%patch2 -p1
+%patch 2 -p1
-%patch3 -p1
+%patch 3 -p1
-%patch4 -p1
+%patch 4 -p1
-%patch5 -p1
+%patch 5 -p1
-%patch6 -p1
+%patch 6 -p1
-%patch7 -p1
+%patch 7 -p1
-%patch8 -p1
+%patch 8 -p1
-%patch9 -p1
+%patch 9 -p1
-%patch10 -p1
+%patch 10 -p1
-%patch11 -p1
+%patch 11 -p1
-%patch12 -p1
+%patch 12 -p1
-%patch13 -p1
+%patch 13 -p1
-%patch14 -p1
+%patch 14 -p1
-%patch15 -p1
+%patch 15 -p1
-%patch16 -p1
+%patch 16 -p1
-%patch17 -p1
+%patch 17 -p1
-%patch18 -p1
+%patch 18 -p1
-%patch19 -p1
+%patch 19 -p1
-%patch20 -p1
+%patch 20 -p1
-%patch21 -p1
+%patch 21 -p1
-%patch22 -p1
+%patch 22 -p1
-%patch23 -p1
+%patch 23 -p1
-%patch24 -p1
+%patch 24 -p1
-%patch25 -p1
+%patch 25 -p1
-%patch26 -p1
+%patch 26 -p1
-%patch27 -p1
+%patch 27 -p1
-%patch28 -p1
+%patch 28 -p1
-%patch29 -p1
+%patch 29 -p1
-%patch30 -p1
+%patch 30 -p1
-%patch31 -p1
+%patch 31 -p1
-%patch32 -p1
+%patch 32 -p1
-%patch33 -p1
+%patch 33 -p1
-%patch34 -p1
+%patch 34 -p1
-%patch35 -p1
+%patch 35 -p1
-%patch36 -p1
+%patch 36 -p1
-%patch37 -p1
+%patch 37 -p1
-%patch38 -p1
+%patch 38 -p1
-%patch39 -p1
+%patch 39 -p1
-%patch40 -p1
+%patch 40 -p1
-%patch41 -p1
+%patch 41 -p1
-%patch42 -p1
+%patch 42 -p1
-%patch43 -p1
+%patch 43 -p1
-%patch44 -p1
+%patch 44 -p1
-%patch45 -p1
+%patch 45 -p1
-%patch46 -p1
+%patch 46 -p1
-%patch47 -p1
+%patch 47 -p1
-%patch48 -p1
+%patch 48 -p1
+%patch 49 -p1
+%patch 50 -p1
+%patch 51 -p1
 
 # bundled ha-cloud-support libs
-%patch500 -p1
+%patch 500 -p1
-%patch501 -p1
+%patch 501 -p1
-%patch502 -p1
+%patch 502 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -591,6 +597,13 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Mon May  1 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-37
+- azure-events*: fix for no "Transition Summary" for Pacemaker 2.1+
+- Filesystem: fail if AWS efs-utils not installed when fstype=efs
+
+  Resolves: rhbz#2182415
+  Resolves: rhbz#2183133
+
 * Tue Mar 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-36
 - mysql: fix replication issues
 - LVM-activate: failover with missing PVs