From 62d0081fd0036e7f8056bf51d5e6216f06a02405 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 20 Jul 2023 11:12:10 +0200 Subject: [PATCH] - Filesystem: improve stop-action and allow setting term/kill signals and signal_delay for large filesystems Resolves: rhbz#2189243 --- ...tem-3-fix-signal_delay-default-value.patch | 23 +++++++++++++++++++ resource-agents.spec | 6 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 bz2189243-Filesystem-3-fix-signal_delay-default-value.patch diff --git a/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch b/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch new file mode 100644 index 0000000..5079b76 --- /dev/null +++ b/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch @@ -0,0 +1,23 @@ +From f779fad52e5f515ca81218da6098398bdecac286 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +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. + + How many seconds to wait after sending term/kill signals to processes in stop-action +- ++ + + + diff --git a/resource-agents.spec b/resource-agents.spec index 2e1a8cd..5630859 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -69,7 +69,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 46%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 47%{?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} @@ -147,6 +147,7 @@ Patch55: bz2039692-mysql-2-fix-demoted-score-bounce.patch Patch56: bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch Patch57: bz2189243-Filesystem-1-improve-stop-action.patch Patch58: bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch +Patch59: bz2189243-Filesystem-3-fix-signal_delay-default-value.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -385,6 +386,7 @@ exit 1 %patch56 -p1 %patch57 -p1 %patch58 -p1 +%patch59 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -960,7 +962,7 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Tue Jul 18 2023 Oyvind Albrigtsen - 4.9.0-46 +* Thu Jul 20 2023 Oyvind Albrigtsen - 4.9.0-47 - Filesystem: improve stop-action and allow setting term/kill signals and signal_delay for large filesystems