import resource-agents-4.1.1-95.el8

SOURCES/bz1969968-lvmlockd-remove-with_cmirrord.patch

@@ -0,0 +1,82 @@
+diff --color -uNr a/heartbeat/lvmlockd b/heartbeat/lvmlockd
+--- a/heartbeat/lvmlockd	2021-06-11 16:08:37.725598299 +0200
++++ b/heartbeat/lvmlockd	2021-06-11 16:10:38.690910781 +0200
+@@ -59,14 +59,6 @@
+ <shortdesc lang="en">This agent manages the lvmlockd daemon</shortdesc>
+ 
+ <parameters>
+-<parameter name="with_cmirrord" unique="0" required="0">
+-<longdesc lang="en">
+-Start with cmirrord (cluster mirror log daemon).
+-</longdesc>
+-<shortdesc lang="en">activate cmirrord</shortdesc>
+-<content type="boolean" default="false" />
+-</parameter>
+-
+ <parameter name="pidfile" unique="0">
+ <longdesc lang="en">pid file</longdesc>
+ <shortdesc lang="en">pid file</shortdesc>
+@@ -110,7 +102,6 @@
+ : ${OCF_RESKEY_pidfile:="/run/lvmlockd.pid"}
+ 
+ LOCKD="lvmlockd"
+-CMIRRORD="cmirrord"
+ # 0.5s sleep each count
+ TIMEOUT_COUNT=20
+ 
+@@ -150,12 +141,6 @@
+ 		rc=$?
+ 		mirror_rc=$rc
+ 
+-		if ocf_is_true $OCF_RESKEY_with_cmirrord; then
+-			pid=$(pgrep $CMIRRORD | head -n1)
+-			daemon_is_running "$pid"
+-			mirror_rc=$?
+-		fi
+-
+ 		# If these ever don't match, return error to force recovery
+ 		if [ $mirror_rc -ne $rc ]; then
+ 			return $OCF_ERR_GENERIC
+@@ -235,16 +220,6 @@
+ 		return $OCF_SUCCESS
+ 	fi
+ 
+-	if ocf_is_true $OCF_RESKEY_with_cmirrord; then
+-		ocf_log info "starting ${CMIRRORD}..."
+-		$CMIRRORD
+-		rc=$?
+-		if [ $rc -ne $OCF_SUCCESS ] ; then
+-			ocf_exit_reason "Failed to start ${CMIRRORD}, exit code: $rc"
+-			return $OCF_ERR_GENERIC
+-		fi
+-	fi
+-
+ 	if [ ! -z "$OCF_RESKEY_socket_path" ] ; then
+ 		extras="$extras -s ${OCF_RESKEY_socket_path}"
+ 	fi
+@@ -341,13 +316,8 @@
+ 	pid=$(get_pid)
+ 	kill_stop $LOCKD $pid
+ 
+-	if ocf_is_true $OCF_RESKEY_with_cmirrord; then
+-		pid=$(pgrep $CMIRRORD)
+-		kill_stop $CMIRRORD $pid
+-	fi
+-
+ 	if silent_status ; then
+-		ocf_exit_reason "Failed to stop, ${LOCKD} or ${CMIRRORD} still running."
++		ocf_exit_reason "Failed to stop, ${LOCKD} still running."
+ 		return $OCF_ERR_GENERIC
+ 	fi
+ 
+@@ -370,10 +340,6 @@
+ 	check_binary pgrep
+ 	check_binary lvmlockctl
+ 
+-	if ocf_is_true $OCF_RESKEY_with_cmirrord; then
+-		check_binary $CMIRRORD
+-	fi
+-
+ 	return $OCF_SUCCESS
+ }
+ 

SPECS/resource-agents.spec

@@ -70,7 +70,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.1.1
-Release:	94%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	95%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -279,6 +279,7 @@ Patch187:	bz1939281-aws-vpc-move-ip-add-ENI-lookup.patch
 Patch188:	bz1934651-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch
 Patch189:	bz1872754-pgsqlms-new-ra.patch
 Patch190:	bz1957765-gcp-vpc-move-vip-retry.patch
+Patch191:	bz1969968-lvmlockd-remove-with_cmirrord.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -642,6 +643,7 @@ exit 1
 %patch188 -p1
 %patch189 -p1
 %patch190 -p1
+%patch191 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -1223,6 +1225,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Fri Jun 11 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-95
+- lvmlockd: remove cmirrord support, as cmirrord is incompatible w/lvmlockd
+
+  Resolves: rhbz#1969968
+
 * Wed May 12 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-94
 - gcp-vpc-move-vip: add retry logic