- nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs" in /etc/nfs.conf to

avoid issues with non-clustered Kerberized mounts

  Resolves: RHEL-102979
This commit is contained in:
Oyvind Albrigtsen 2025-10-31 14:47:26 +01:00
parent f6e79d0ea0
commit 5337923d37
3 changed files with 29 additions and 3 deletions

View File

@ -0,0 +1,24 @@
From 72620db5b52c943358faaf77ce5a15fb41169fab Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Fri, 31 Oct 2025 11:22:46 +0100
Subject: [PATCH] nfsserver: set systemd_running before nfsserver_validate() to
avoid error message
---
heartbeat/nfsserver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index 83f4bac51..71a711305 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -1062,8 +1062,8 @@ nfsserver_validate ()
return $OCF_SUCCESS
}
-nfsserver_validate
systemd_is_running; systemd_running=$?
+nfsserver_validate
case $__OCF_ACTION in
start) nfsserver_start

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}.22
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.23
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -179,7 +179,8 @@ Patch82: RHEL-116150-1-ocf-shellfuncs-add-ocf_promotion_score.patch
Patch83: RHEL-116150-2-portblock-add-promotable-support.patch
Patch84: RHEL-116150-3-portblock-fixes-add-method-and-status_check-parameters.patch
Patch85: RHEL-124815-db2-fix-variable-name.patch
Patch86: RHEL-102979-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch86: RHEL-102979-1-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch87: RHEL-102979-2-nfsserver-fix-error-message.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
@ -451,6 +452,7 @@ exit 1
%patch -p1 -P 84
%patch -p1 -P 85
%patch -p1 -P 86
%patch -p1 -P 87
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
@ -1041,7 +1043,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.22
* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.23
- nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs"
in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts