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-180766
This commit is contained in:
Arslan Ahmad 2026-06-10 18:47:08 +05:30
parent b33a44ae74
commit 0e6350feed
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
RHEL-180766-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

6
resource-agents.spec
View File

@ -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}.34
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.35
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -187,6 +187,7 @@ Patch90: RHEL-166181-1-db2-fix-bashism.patch
Patch91: RHEL-166181-2-db2-do-not-use-db2stop-to-avoid-divergence-in-the-log.patch
Patch92: RHEL-180766-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch
Patch93: RHEL-180766-2-nfsserver-fixes-incorrect-indentation.patch
Patch94: RHEL-180766-3-nfsserver-do-not-try-to-stop-fsidd-when-not-present.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
@ -470,6 +471,7 @@ exit 1
%patch -p1 -P 91
%patch -p1 -P 92
%patch -p1 -P 93
%patch -p1 -P 94
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
@ -1067,7 +1069,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Tue Jun 02 2026 Arslan Ahmad <arahmad@redhat.com> - 4.9.0-54.34
* Wed Jun 10 2026 Arslan Ahmad <arahmad@redhat.com> - 4.9.0-54.35
- nfsserver: stop fsidd when stopping nfsserver
Resolves: RHEL-180766