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

- nfsserver: stop fsidd when stopping nfsserver

Browse Source 
Fix for validating the unit file during stop
  operation

  Resolves: RHEL-180765
This commit is contained in:
Arslan Ahmad 2026-06-10 17:37:46 +05:30
parent 8721848083
commit 01c579f6c9
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
RHEL-180765-3-nfsserver-do-not-try-to-stop-fsidd-when-not-present.patch Normal file
View File

@ -0,0 +1,42 @@
From 8000ba8d308a775c2cc8358ae2ef5b1b78b68221 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 10 Jun 2026 08:50:12 +0200
Subject: [PATCH] nfsserver: dont try to stop fsidd when not present
---
heartbeat/nfsserver | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index ab0710c48..ed916cac5 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -1012,16 +1012,18 @@ 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
+ if systemctl --no-legend list-unit-files "fsidd.service" | grep -q fsidd.service; then
+ 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
fi
esac

14
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.16.0
Release: 68%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 69%{?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
@ -139,6 +139,7 @@ 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
Patch89: RHEL-156729-sybaseASE-fix-for-missing-sybaseASE-env-during-probe-action.patch
Patch90: RHEL-180765-3-nfsserver-do-not-try-to-stop-fsidd-when-not-present.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -399,6 +400,7 @@ exit 1
%patch -p1 -P 87
%patch -p1 -P 88
%patch -p1 -P 89
%patch -p1 -P 90
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -731,16 +733,16 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Wed Jun 10 2026 Arslan Ahmad <arahmad@redhat.com> - 4.16.0-69
- nfsserver: stop fsidd when stopping nfsserver
Resolves: RHEL-180765
* Thu Jun 04 2026 Arslan Ahmad <arahmad@redhat.com> - 4.16.0-68
- sybaseASE: dont report error about missing sybaseASE env file
Resolves: RHEL-156729
* Tue Jun 02 2026 Arslan Ahmad <arahmad@redhat.com> - 4.16.0-67
- nfsserver: stop fsidd when stopping nfsserver
Resolves: RHEL-180765
* Tue Jun 2 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-66
- IPaddr2: dont return OCF_ERR_INSTALLED during monitor
- aws-vpc-move-ip: add awscli_timeout parameter