From 9126983f9bbaab008600037ddfadfa981b2739ef Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Mon, 22 May 2023 13:41:07 +0200 Subject: [PATCH] - resource-agents-paf: add perl-lib dependency - Filesystem: create systemd drop-in for network filesystems Resolves: rhbz#2203813 Resolves: rhbz#2184779 --- ...79-Filesystem-systemd-drop-in-net-fs.patch | 29 +++++++++++++++++++ resource-agents.spec | 13 +++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 bz2184779-Filesystem-systemd-drop-in-net-fs.patch diff --git a/bz2184779-Filesystem-systemd-drop-in-net-fs.patch b/bz2184779-Filesystem-systemd-drop-in-net-fs.patch new file mode 100644 index 0000000..abb285c --- /dev/null +++ b/bz2184779-Filesystem-systemd-drop-in-net-fs.patch @@ -0,0 +1,29 @@ +From 78622f1d3e46d58b78efe33643d05bea4d6948a2 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 17 May 2023 12:29:38 +0200 +Subject: [PATCH] Filesystem: create systemd drop-in for network filesystems + +--- + heartbeat/Filesystem | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index 50c68f115..65a9dffb5 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -1021,6 +1021,7 @@ is_option "ro" && + case "$FSTYPE" in + nfs4|nfs|efs|smbfs|cifs|none|gfs2|glusterfs|ceph|ocfs2|overlay|overlayfs|tmpfs|cvfs|lustre) + CLUSTERSAFE=1 # this is kind of safe too ++ systemd_drop_in "99-Filesystem-remote" "After" "remote-fs.target" + ;; + # add here CLUSTERSAFE=0 for all filesystems which are not + # cluster aware and which, even if when mounted read-only, +@@ -1028,6 +1029,7 @@ nfs4|nfs|efs|smbfs|cifs|none|gfs2|glusterfs|ceph|ocfs2|overlay|overlayfs|tmpfs|c + ext4|ext4dev|ext3|reiserfs|reiser4|xfs|jfs) + if ocf_is_true "$OCF_RESKEY_force_clones"; then + CLUSTERSAFE=2 ++ systemd_drop_in "99-Filesystem-remote" "After" "remote-fs.target" + else + CLUSTERSAFE=0 # these are not allowed + fi diff --git a/resource-agents.spec b/resource-agents.spec index 99cc45c..ff444e0 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 38%{?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 @@ -101,6 +101,7 @@ Patch48: bz2174911-LVM-activate-failover-with-missing-pvs.patch Patch49: bz2182415-azure-events-1-fix-no-transition-summary.patch Patch50: bz2182415-azure-events-2-improve-logic.patch Patch51: bz2183133-Filesystem-fail-efs-utils-not-installed.patch +Patch52: bz2184779-Filesystem-systemd-drop-in-net-fs.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -212,7 +213,7 @@ in a cluster environment. License: PostgreSQL Summary: PostgreSQL Automatic Failover (PAF) resource agent Requires: %{name} = %{version}-%{release} -Requires: perl-interpreter perl-English perl-FindBin +Requires: perl-interpreter perl-lib perl-English perl-FindBin %description paf PostgreSQL Automatic Failover (PAF) resource agents allows PostgreSQL @@ -276,6 +277,7 @@ exit 1 %patch49 -p1 %patch50 -p1 %patch51 -p1 +%patch52 -p1 # bundled ha-cloud-support libs %patch500 -p1 @@ -597,6 +599,13 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon May 22 2023 Oyvind Albrigtsen - 4.10.0-38 +- resource-agents-paf: add perl-lib dependency +- Filesystem: create systemd drop-in for network filesystems + + Resolves: rhbz#2203813 + Resolves: rhbz#2184779 + * Mon May 1 2023 Oyvind Albrigtsen - 4.10.0-37 - azure-events*: fix for no "Transition Summary" for Pacemaker 2.1+ - Filesystem: fail if AWS efs-utils not installed when fstype=efs