import resource-agents-4.9.0-32.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
0801d39eb1
commit
75350cf3c4
|
|
@ -0,0 +1,84 @@
|
|||
From e2174244067b02d798e0f12437f0f499c80f91fe Mon Sep 17 00:00:00 2001
|
||||
From: Reid Wahl <nrwahl@protonmail.com>
|
||||
Date: Tue, 1 Feb 2022 18:55:47 -0800
|
||||
Subject: [PATCH] Filesystem: Add support for Amazon EFS mount helper
|
||||
|
||||
mount.efs, the mount helper for Amazon Elastic File System (EFS)
|
||||
provided by amazon-efs-utils [1], is a wrapper for mount.nfs4. It offers
|
||||
a number of AWS-specific mount options and some security improvements
|
||||
like encryption of data in transit.
|
||||
|
||||
This commit adds support by treating an fstype=efs like fstype=nfs4 for
|
||||
the most part.
|
||||
|
||||
Resolves: RHBZ#2049319
|
||||
|
||||
[1] https://docs.aws.amazon.com/efs/latest/ug/efs-mount-helper.html
|
||||
|
||||
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
||||
---
|
||||
heartbeat/Filesystem | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
||||
index 4d84846c1..1a90d6a42 100755
|
||||
--- a/heartbeat/Filesystem
|
||||
+++ b/heartbeat/Filesystem
|
||||
@@ -341,7 +341,7 @@ determine_blockdevice() {
|
||||
# Get the current real device name, if possible.
|
||||
# (specified devname could be -L or -U...)
|
||||
case "$FSTYPE" in
|
||||
- nfs4|nfs|smbfs|cifs|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs|none|lustre)
|
||||
+ nfs4|nfs|efs|smbfs|cifs|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs|none|lustre)
|
||||
: ;;
|
||||
*)
|
||||
match_string="${TAB}${CANONICALIZED_MOUNTPOINT}${TAB}"
|
||||
@@ -423,7 +423,7 @@ is_fsck_needed() {
|
||||
no) false;;
|
||||
""|auto)
|
||||
case "$FSTYPE" in
|
||||
- ext4|ext4dev|ext3|reiserfs|reiser4|nss|xfs|jfs|vfat|fat|nfs4|nfs|cifs|smbfs|ocfs2|gfs2|none|lustre|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs)
|
||||
+ ext4|ext4dev|ext3|reiserfs|reiser4|nss|xfs|jfs|vfat|fat|nfs4|nfs|efs|cifs|smbfs|ocfs2|gfs2|none|lustre|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs)
|
||||
false;;
|
||||
*)
|
||||
true;;
|
||||
@@ -450,9 +450,11 @@ fstype_supported()
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
- # support fuse-filesystems (e.g. GlusterFS)
|
||||
+ # support fuse-filesystems (e.g. GlusterFS) and Amazon Elastic File
|
||||
+ # System (EFS)
|
||||
case "$FSTYPE" in
|
||||
fuse.*|glusterfs|rozofs) support="fuse";;
|
||||
+ efs) support="nfs4";;
|
||||
esac
|
||||
|
||||
if [ "$support" != "$FSTYPE" ]; then
|
||||
@@ -701,7 +703,7 @@ Filesystem_stop()
|
||||
|
||||
# For networked filesystems, there's merit in trying -f:
|
||||
case "$FSTYPE" in
|
||||
- nfs4|nfs|cifs|smbfs) umount_force="-f" ;;
|
||||
+ nfs4|nfs|efs|cifs|smbfs) umount_force="-f" ;;
|
||||
esac
|
||||
|
||||
# Umount all sub-filesystems mounted under $MOUNTPOINT/ too.
|
||||
@@ -892,7 +894,7 @@ set_blockdevice_var() {
|
||||
|
||||
# these are definitely not block devices
|
||||
case "$FSTYPE" in
|
||||
- nfs4|nfs|smbfs|cifs|none|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs|lustre) return;;
|
||||
+ nfs4|nfs|efs|smbfs|cifs|none|glusterfs|ceph|tmpfs|overlay|overlayfs|rozofs|zfs|cvfs|lustre) return;;
|
||||
esac
|
||||
|
||||
if $(is_option "loop"); then
|
||||
@@ -1013,7 +1015,7 @@ is_option "ro" &&
|
||||
CLUSTERSAFE=2
|
||||
|
||||
case "$FSTYPE" in
|
||||
-nfs4|nfs|smbfs|cifs|none|gfs2|glusterfs|ceph|ocfs2|overlay|overlayfs|tmpfs|cvfs|lustre)
|
||||
+nfs4|nfs|efs|smbfs|cifs|none|gfs2|glusterfs|ceph|ocfs2|overlay|overlayfs|tmpfs|cvfs|lustre)
|
||||
CLUSTERSAFE=1 # this is kind of safe too
|
||||
;;
|
||||
# add here CLUSTERSAFE=0 for all filesystems which are not
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From 739e6ce9096facd6d37dffd524c79c961e3fae38 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Fri, 11 Nov 2022 14:17:39 +0100
|
||||
Subject: [PATCH] vdo-vol: dont fail probe action when the underlying device
|
||||
doesnt exist
|
||||
|
||||
---
|
||||
heartbeat/vdo-vol | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/heartbeat/vdo-vol b/heartbeat/vdo-vol
|
||||
index 94822cb82..29bd7b8fd 100755
|
||||
--- a/heartbeat/vdo-vol
|
||||
+++ b/heartbeat/vdo-vol
|
||||
@@ -148,6 +148,12 @@ vdo_monitor(){
|
||||
MODE=$(vdostats --verbose ${OCF_RESKEY_volume} | grep "operating mode" | awk '{print $NF}')
|
||||
|
||||
case "$status" in
|
||||
+ *"ERROR - vdodumpconfig: Failed to make FileLayer from"*)
|
||||
+ if ocf_is_probe; then
|
||||
+ return $OCF_NOT_RUNNING
|
||||
+ fi
|
||||
+ return $OCF_ERR_GENERIC
|
||||
+ ;;
|
||||
*"Device mapper status: not available"*)
|
||||
return $OCF_NOT_RUNNING
|
||||
;;
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.9.0
|
||||
Release: 31%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 32%{?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}
|
||||
|
|
@ -127,6 +127,8 @@ Patch35: bz2109159-storage_mon-4-fix-possible-false-negatives.patch
|
|||
Patch36: bz1905820-LVM-activate-fix-return-codes.patch
|
||||
Patch37: bz1977012-azure-events-az-new-ra.patch
|
||||
Patch38: bz2133682-IPsrcaddr-proto-metric-scope-default-route-fixes.patch
|
||||
Patch39: bz2141836-vdo-vol-dont-fail-probe-action.patch
|
||||
Patch40: bz2049319-Filesystem-add-support-for-Amazon-EFS.patch
|
||||
|
||||
# bundle patches
|
||||
Patch1000: 7-gcp-bundled.patch
|
||||
|
|
@ -345,6 +347,8 @@ exit 1
|
|||
%patch36 -p1
|
||||
%patch37 -p1
|
||||
%patch38 -p1
|
||||
%patch39 -p1
|
||||
%patch40 -p1 -F1
|
||||
|
||||
chmod 755 heartbeat/nova-compute-wait
|
||||
chmod 755 heartbeat/NovaEvacuate
|
||||
|
|
@ -920,6 +924,14 @@ ccs_update_schema > /dev/null 2>&1 ||:
|
|||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Mon Nov 14 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-32
|
||||
- Filesystem: add support for Amazon EFS (Elastic File System)
|
||||
- vdo-vol: dont fail probe action when the underlying device doesnt
|
||||
exist
|
||||
|
||||
Resolves: rhbz#2049319
|
||||
Resolves: rhbz#2141836
|
||||
|
||||
* Fri Oct 14 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-31
|
||||
- IPsrcaddr: proto, metric, scope and default route fixes
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue