- Filesystem: improve stop-action and allow setting term/kill signals
and signal_delay for large filesystems - Delay: increase stop, status and monitor timeouts to 40s to avoid failing with default values Resolves: rhbz#2207567 Resolves: rhbz#2209433
This commit is contained in:
Oyvind Albrigtsen
parent
eb72aa316f
commit
ff9bf9edaf
|
|
@ -0,0 +1,49 @@
|
|||
From 7056635f3f94c1bcaaa5ed5563dc3b0e9f6749e0 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 18 Jul 2023 14:12:27 +0200
|
||||
Subject: [PATCH] Filesystem: dont use boolean type for non-boolean parameters
|
||||
|
||||
---
|
||||
heartbeat/Filesystem | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
||||
index ee55a4843..b9aae8d50 100755
|
||||
--- a/heartbeat/Filesystem
|
||||
+++ b/heartbeat/Filesystem
|
||||
@@ -269,7 +269,7 @@ fuser cli tool. fuser is known to perform operations that can potentially
|
||||
block if unresponsive nfs mounts are in use on the system.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Kill processes before unmount</shortdesc>
|
||||
-<content type="boolean" default="${OCF_RESKEY_force_unmount_default}" />
|
||||
+<content type="string" default="${OCF_RESKEY_force_unmount_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="term_signals">
|
||||
@@ -277,7 +277,7 @@ block if unresponsive nfs mounts are in use on the system.
|
||||
Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action</shortdesc>
|
||||
-<content type="boolean" default="${OCF_RESKEY_term_signals_default}" />
|
||||
+<content type="string" default="${OCF_RESKEY_term_signals_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="kill_signals">
|
||||
@@ -285,7 +285,7 @@ Signals (names or numbers, whitespace separated) to send processes during gracef
|
||||
Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action</shortdesc>
|
||||
-<content type="boolean" default="${OCF_RESKEY_kill_signals_default}" />
|
||||
+<content type="string" default="${OCF_RESKEY_kill_signals_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="signal_delay">
|
||||
@@ -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="boolean" default="${OCF_RESKEY_kill_signal_delay}" />
|
||||
+<content type="string" default="${OCF_RESKEY_kill_signal_delay}" />
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From fe8a807dae0398b811d1ee63ebd7202280b2b678 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 18 Jul 2023 14:51:00 +0200
|
||||
Subject: [PATCH] Delay: remove statement about defaulting to "startdelay"
|
||||
value if not specified
|
||||
|
||||
---
|
||||
heartbeat/Delay | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/Delay b/heartbeat/Delay
|
||||
index bc6c13559..5aa8f4608 100755
|
||||
--- a/heartbeat/Delay
|
||||
+++ b/heartbeat/Delay
|
||||
@@ -71,7 +71,6 @@ How long in seconds to delay on start operation.
|
||||
<parameter name="stopdelay" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
How long in seconds to delay on stop operation.
|
||||
-Defaults to "startdelay" if unspecified.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Stop delay</shortdesc>
|
||||
<content type="integer" default="${OCF_RESKEY_stopdelay_default}" />
|
||||
@@ -80,7 +79,6 @@ Defaults to "startdelay" if unspecified.
|
||||
<parameter name="mondelay" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
How long in seconds to delay on monitor operation.
|
||||
-Defaults to "startdelay" if unspecified.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Monitor delay</shortdesc>
|
||||
<content type="integer" default="${OCF_RESKEY_mondelay_default}" />
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.10.0
|
||||
Release: 41%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 42%{?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
|
||||
|
|
@ -104,8 +104,10 @@ Patch51: bz2183133-Filesystem-fail-efs-utils-not-installed.patch
|
|||
Patch52: bz2184779-Filesystem-systemd-drop-in-net-fs.patch
|
||||
Patch53: bz2179003-mysql-2-fix-demoted-score-bounce.patch
|
||||
Patch54: bz2142518-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
|
||||
Patch55: bz2207567-Filesystem-improve-stop-action.patch
|
||||
Patch56: bz2209433-Delay-increase-default-timeouts.patch
|
||||
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
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aws.patch
|
||||
|
|
@ -286,6 +288,8 @@ exit 1
|
|||
%patch54 -p1
|
||||
%patch55 -p1
|
||||
%patch56 -p1
|
||||
%patch57 -p1
|
||||
%patch58 -p1
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch500 -p1
|
||||
|
|
@ -607,7 +611,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Wed Jul 12 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-41
|
||||
* Tue Jul 18 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-42
|
||||
- Filesystem: improve stop-action and allow setting term/kill signals
|
||||
and signal_delay for large filesystems
|
||||
- Delay: increase stop, status and monitor timeouts to 40s to avoid
|
||||
|
|
|
|||
Loading…
Reference in New Issue