- Filesystem: improve stop-action and allow setting term/kill signals

and signal_delay for large filesystems

  Resolves: rhbz#2207567

bz2207567-Filesystem-3-fix-signal_delay-default-value.patch

@@ -0,0 +1,23 @@
+From f779fad52e5f515ca81218da6098398bdecac286 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 20 Jul 2023 10:18:12 +0200
+Subject: [PATCH] Filesystem: fix incorrect variable name for signal_delay
+ default in metadata
+
+---
+ heartbeat/Filesystem | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index b9aae8d50..066562891 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -293,7 +293,7 @@ Signals (names or numbers, whitespace separated) to send processes during forcef
+ How many seconds to wait after sending term/kill signals to processes in stop-action.
+ </longdesc>
+ <shortdesc lang="en">How many seconds to wait after sending term/kill signals to processes in stop-action</shortdesc>
+-<content type="string" default="${OCF_RESKEY_kill_signal_delay}" />
++<content type="string" default="${OCF_RESKEY_signal_delay_default}" />
+ </parameter>
+ 
+ </parameters>

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	42%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	43%{?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
@@ -108,6 +108,7 @@ Patch55:	bz2207567-Filesystem-1-improve-stop-action.patch
 Patch56:	bz2207567-Filesystem-2-fix-incorrect-parameter-types.patch
 Patch57:	bz2209433-Delay-1-increase-default-timeouts.patch
 Patch58:	bz2209433-Delay-2-remove-incorrect-statement.patch
+Patch59:	bz2207567-Filesystem-3-fix-signal_delay-default-value.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -290,6 +291,7 @@ exit 1
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1
+%patch59 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -611,13 +613,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Tue Jul 18 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-42
+* Thu Jul 20 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-43
 - Filesystem: improve stop-action and allow setting term/kill signals
   and signal_delay for large filesystems
+
+  Resolves: rhbz#2207567
+
+* Tue Jul 18 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-42
 - Delay: increase stop, status and monitor timeouts to 40s to avoid
   failing with default values
 
-  Resolves: rhbz#2207567
   Resolves: rhbz#2209433
 
 * Wed Jun 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-40