resource-agents/SOURCES/bz1818997-nfsserver-1-fix-nfsv4-only-support.patch

44 lines
1.4 KiB
Diff
Raw Normal View History

2021-05-14 04:17:31 +00:00
From 47dd1d16f08de06d512f9e04c3966c35f0ac4d3f Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 27 May 2020 13:05:57 +0200
Subject: [PATCH] nfsserver: fix NFSv4-only support
When disabling NFSv2 and NFSv3 mountd doesnt register with rpcbind, but
it's still running. This patch checks that mountd is running instead of
basing its status on it being registered w/rpcbind.
---
heartbeat/nfsserver | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index acef0147a..9e6e1fcb1 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -316,7 +316,7 @@ nfsserver_systemd_monitor()
fi
ocf_log debug "Status: nfs-mountd"
- rpcinfo -t localhost 100005 > /dev/null 2>&1
+ ps axww | grep -q "[r]pc.mountd"
rc=$?
if [ "$rc" -ne "0" ]; then
ocf_exit_reason "nfs-mountd is not running"
@@ -683,7 +683,7 @@ nfsserver_start ()
local i=1
while : ; do
ocf_log info "Start: nfs-mountd i: $i"
- rpcinfo -t localhost 100005 > /dev/null 2>&1
+ ps axww | grep -q "[r]pc.mountd"
rc=$?
if [ "$rc" -eq "0" ]; then
break;
@@ -800,7 +800,7 @@ nfsserver_stop ()
nfs_exec stop nfs-mountd > /dev/null 2>&1
ocf_log info "Stop: nfs-mountd"
- rpcinfo -t localhost 100005 > /dev/null 2>&1
+ ps axww | grep -q "[r]pc.mountd"
rc=$?
if [ "$rc" -eq "0" ]; then
ocf_exit_reason "Failed to stop nfs-mountd"