rpms/resource-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Filesystem: change force_unmount default to safe for RHEL9+

Browse Source 
Resolves: rhbz#1843578
This commit is contained in:
Oyvind Albrigtsen 2021-03-16 12:35:57 +01:00
parent 402c07e0eb
commit 677db36268
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bz1843578-Filesystem-force_unmount-safe.patch → bz1843578-Filesystem-1-force_unmount-safe.patch
View File

39
bz1843578-Filesystem-2-fix-force_unmount-safe.patch Normal file
View File

@ -0,0 +1,39 @@
From e0cfb07e0d8470b22ea825224ee31f2f987c39d7 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Mon, 15 Mar 2021 10:41:10 +0100
Subject: [PATCH] Filesystem: fix force_unmount default to safe for RHEL9+
issue introduced in b792a143fc90468f8911243a5ea77c0c424bd624
---
heartbeat/Filesystem | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index 48d58e1d5..9d8a786f9 100755
--- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem
@@ -72,15 +72,19 @@ OCF_RESKEY_fast_stop_default="no"
OCF_RESKEY_force_clones_default="false"
OCF_RESKEY_force_unmount_default="true"
-# RHEL9+ specific defaults
+# RHEL specific defaults
if is_redhat_based; then
get_os_ver
ocf_version_cmp "$VER" "9.0" 2>/dev/null
- if [ "$?" -eq 0 ]; then
- OCF_RESKEY_fast_stop_default="yes"
- OCF_RESKEY_force_unmount_default="safe"
- fi
+ case "$?" in
+ # RHEL >= 9
+ 1|2)
+ OCF_RESKEY_force_unmount_default="safe";;
+ # RHEL < 9 and fallback if ocf_version_cmp() fails
+ *)
+ OCF_RESKEY_fast_stop_default="yes";;
+ esac
fi

7
resource-agents.spec
View File

@ -45,12 +45,13 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.7.0
Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 7%{?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
Patch0: ha-cloud-support-aws.patch
Patch1: bz1843578-Filesystem-force_unmount-safe.patch
Patch1: bz1843578-Filesystem-1-force_unmount-safe.patch
Patch2: bz1843578-Filesystem-2-fix-force_unmount-safe.patch
Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version}
@ -402,7 +403,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%changelog
* Wed Mar 3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-6
* Tue Mar 16 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-7
- Filesystem: change force_unmount default to safe for RHEL9+
Resolves: rhbz#1843578