From 8df5f7fd90e82a2602023a970c96610503d03c6b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 5 Nov 2024 07:48:54 +0000 Subject: [PATCH] import from CS git resource-agents-4.9.0-54.el8.5 --- .gitignore | 2 +- ...r-also-stop-rpc-statd-for-nfsv4_only.patch | 38 +++++++++++++++++++ SPECS/resource-agents.spec | 10 ++++- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch diff --git a/.gitignore b/.gitignore index 65e1103..c285f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ SOURCES/httplib2-0.20.4.tar.gz SOURCES/pycryptodome-3.20.0.tar.gz SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl SOURCES/pyroute2-0.4.13.tar.gz -SOURCES/urllib3-1.26.18.tar.gz +SOURCES/urllib3-1.26.18.tar.gz \ No newline at end of file diff --git a/SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch b/SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch new file mode 100644 index 0000000..73e2324 --- /dev/null +++ b/SOURCES/RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch @@ -0,0 +1,38 @@ +From 38eaf00bc81af7530c56eba282918762a47a9326 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 19 Sep 2024 13:01:53 +0200 +Subject: [PATCH] nfsserver: also stop rpc-statd for nfsv4_only to avoid stop + failing in some cases + +E.g. nfs_no_notify=true nfsv4_only=true nfs_shared_infodir=/nfsmq/nfsinfo would cause a "Failed to unmount a bind mount" error +--- + heartbeat/nfsserver | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver +index 5793d7a70..fd9268afc 100755 +--- a/heartbeat/nfsserver ++++ b/heartbeat/nfsserver +@@ -947,15 +947,13 @@ nfsserver_stop () + sleep 1 + done + +- if ! ocf_is_true "$OCF_RESKEY_nfsv4_only"; then +- nfs_exec stop rpc-statd > /dev/null 2>&1 +- ocf_log info "Stop: rpc-statd" +- rpcinfo -t localhost 100024 > /dev/null 2>&1 +- rc=$? +- if [ "$rc" -eq "0" ]; then +- ocf_exit_reason "Failed to stop rpc-statd" +- return $OCF_ERR_GENERIC +- fi ++ nfs_exec stop rpc-statd > /dev/null 2>&1 ++ ocf_log info "Stop: rpc-statd" ++ rpcinfo -t localhost 100024 > /dev/null 2>&1 ++ rc=$? ++ if [ "$rc" -eq "0" ]; then ++ ocf_exit_reason "Failed to stop rpc-statd" ++ return $OCF_ERR_GENERIC + fi + + nfs_exec stop nfs-idmapd > /dev/null 2>&1 diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 2f2019d..c93da8e 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -73,7 +73,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.4 +Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.5 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -162,6 +162,7 @@ Patch65: RHEL-17083-findif-EOS-fix.patch Patch66: RHEL-15305-2-findif.sh-dont-use-table-parameter.patch Patch67: RHEL-34137-aws-agents-use-curl_retry.patch Patch68: RHEL-32828-db2-fix-OCF_SUCESS-typo.patch +Patch69: RHEL-61138-nfsserver-also-stop-rpc-statd-for-nfsv4_only.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -414,6 +415,7 @@ exit 1 %patch -p1 -P 66 %patch -p1 -P 67 -F1 %patch -p1 -P 68 +%patch -p1 -P 69 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -1003,6 +1005,12 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Oct 1 2024 Oyvind Albrigtsen - 4.9.0-54.5 +- nfsserver: also stop rpc-statd for nfsv4_only to avoid stop failing + in some cases + + Resolves: RHEL-61138 + * Thu Jul 25 2024 Oyvind Albrigtsen - 4.9.0-54.4 - bundled setuptools: fix CVE-2024-6345