From 00809275d5e9f7b6a25cd010786116f8071b9fac Mon Sep 17 00:00:00 2001 From: Arslan Ahmad Date: Tue, 2 Jun 2026 20:39:49 +0530 Subject: [PATCH] - nfsserver: stop fsidd when stopping nfsserver Resolves: RHEL-180765 --- ...unt-failure-of-bind-mount-with-fsidd.patch | 33 ++++++++++++++ ...fsserver-fixes-incorrect-indentation.patch | 43 +++++++++++++++++++ resource-agents.spec | 11 ++++- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 RHEL-180765-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch create mode 100644 RHEL-180765-2-nfsserver-fixes-incorrect-indentation.patch diff --git a/RHEL-180765-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch b/RHEL-180765-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch new file mode 100644 index 0000000..75d2450 --- /dev/null +++ b/RHEL-180765-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch @@ -0,0 +1,33 @@ +From f671a00108d0b272493b4b4a0a5fb838e5eca2af Mon Sep 17 00:00:00 2001 +From: Silvan Raijer +Date: Wed, 27 May 2026 11:10:19 +0200 +Subject: [PATCH] nfsserver: Stop fsidd when stopping nfs-server + +Signed-off-by: Silvan Raijer +--- + heartbeat/nfsserver | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver +index fe15abc06..f41ef92c0 100755 +--- a/heartbeat/nfsserver ++++ b/heartbeat/nfsserver +@@ -1010,6 +1010,18 @@ nfsserver_stop () + return $OCF_ERR_GENERIC + fi + fi ++ ++ nfs_exec stop fsidd > /dev/null 2>&1 ++ ocf_log info "Stop: fsidd" ++ fn=`mktemp` ++ nfs_exec status fsidd > $fn 2>&1 ++ rc=$? ++ ocf_log debug "$(cat $fn)" ++ rm -f $fn ++ if [ "$rc" -eq "0" ]; then ++ ocf_exit_reason "Failed to stop fsidd" ++ return $OCF_ERR_GENERIC ++ fi + esac + + diff --git a/RHEL-180765-2-nfsserver-fixes-incorrect-indentation.patch b/RHEL-180765-2-nfsserver-fixes-incorrect-indentation.patch new file mode 100644 index 0000000..7ccdeec --- /dev/null +++ b/RHEL-180765-2-nfsserver-fixes-incorrect-indentation.patch @@ -0,0 +1,43 @@ +From ba7d5d59308458e1892fd29c9a719c8779dd46b6 Mon Sep 17 00:00:00 2001 +From: Arslan Ahmad +Date: Tue, 2 Jun 2026 18:10:11 +0530 +Subject: [PATCH] nfsserver: Fixes the incorrect indentation + +Signed-off-by: Arslan Ahmad +--- + heartbeat/nfsserver | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver +index f41ef92c0..93428bfd1 100755 +--- a/heartbeat/nfsserver ++++ b/heartbeat/nfsserver +@@ -1011,17 +1011,17 @@ nfsserver_stop () + fi + fi + +- nfs_exec stop fsidd > /dev/null 2>&1 +- ocf_log info "Stop: fsidd" +- fn=`mktemp` +- nfs_exec status fsidd > $fn 2>&1 +- rc=$? +- ocf_log debug "$(cat $fn)" +- rm -f $fn +- if [ "$rc" -eq "0" ]; then +- ocf_exit_reason "Failed to stop fsidd" +- return $OCF_ERR_GENERIC +- fi ++ nfs_exec stop fsidd > /dev/null 2>&1 ++ ocf_log info "Stop: fsidd" ++ fn=`mktemp` ++ nfs_exec status fsidd > $fn 2>&1 ++ rc=$? ++ ocf_log debug "$(cat $fn)" ++ rm -f $fn ++ if [ "$rc" -eq "0" ]; then ++ ocf_exit_reason "Failed to stop fsidd" ++ return $OCF_ERR_GENERIC ++ fi + esac + + diff --git a/resource-agents.spec b/resource-agents.spec index c1dd6fa..703a414 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.16.0 -Release: 66%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 67%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -136,6 +136,8 @@ Patch83: RHEL-176288-IPaddr2-fix-interfaces-named-with-keywords.patch Patch84: RHEL-173129-iSCSILogicalUnit-add-block-size-override-and-backstore-type-selection.patch Patch85: RHEL-180733-IPaddr2-dont-return-OCF_ERR_INSTALLED-during-monitor.patch Patch86: RHEL-162109-aws-vpc-move-ip-add-awscli_timeout-parameter.patch +Patch87: RHEL-180765-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch +Patch88: RHEL-180765-2-nfsserver-fixes-incorrect-indentation.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -393,6 +395,8 @@ exit 1 %patch -p1 -P 84 %patch -p1 -P 85 %patch -p1 -P 86 +%patch -p1 -P 87 +%patch -p1 -P 88 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -725,6 +729,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Jun 02 2026 Arslan Ahmad - 4.16.0-67 +- nfsserver: stop fsidd when stopping nfsserver + + Resolves: RHEL-180765 + * Tue Jun 2 2026 Oyvind Albrigtsen - 4.16.0-66 - IPaddr2: dont return OCF_ERR_INSTALLED during monitor - aws-vpc-move-ip: add awscli_timeout parameter