Skip to content

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 #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −11
Open

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 #2065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions heartbeat/nfsserver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ set_exec_mode()
##
# If the user defined an init script, It must exist for us to continue
##
if ! $systemd_is_running && [ -n "$OCF_RESKEY_nfs_init_script" ]; then
if [ $systemd_running -ne 0 ] && [ -n "$OCF_RESKEY_nfs_init_script" ]; then
# check_binary will exit the process if init script does not exist
check_binary ${OCF_RESKEY_nfs_init_script}
EXEC_MODE=1
Expand All @@ -274,7 +274,7 @@ set_exec_mode()
##
# Check to see if the default init script exists, if so we'll use that.
##
if ! $systemd_is_running && which $DEFAULT_INIT_SCRIPT > /dev/null 2>&1; then
if [ $systemd_running -ne 0 ] && which $DEFAULT_INIT_SCRIPT > /dev/null 2>&1; then
OCF_RESKEY_nfs_init_script=$DEFAULT_INIT_SCRIPT
EXEC_MODE=1
return 0
Expand Down Expand Up @@ -780,7 +780,7 @@ nfsserver_start ()
# the uts namespace is useless in that case.
# If systemd is running, mangle the nfs-server.service unit,
# independent of the "EXEC_MODE" we detected.
if $systemd_is_running ; then
if [ $systemd_running -eq 0 ]; then
if [ -z "$OCF_RESKEY_nfs_server_scope" ] ; then
remove_unshare_uts_dropins
else
Expand All @@ -789,7 +789,9 @@ nfsserver_start ()
fi

if ! `mount | grep -q " on $OCF_RESKEY_rpcpipefs_dir "`; then
mount -t rpc_pipefs sunrpc $OCF_RESKEY_rpcpipefs_dir
if [ $systemd_running -ne 0 ] || { [ $systemd_running -eq 0 ] && systemctl -q is-enabled var-lib-nfs-rpc_pipefs.mount ;}; then
mount -t rpc_pipefs sunrpc $OCF_RESKEY_rpcpipefs_dir
fi
fi

# remove the sm-notify pid so sm-notify will be allowed to run again without requiring a reboot.
Expand Down Expand Up @@ -1003,11 +1005,15 @@ nfsserver_stop ()
fi
fi

# systemd
case $EXEC_MODE in
[23]) nfs_exec stop rpc-gssd > /dev/null 2>&1
ocf_log info "Stop: rpc-gssd"
esac

if mount | grep -q " on $OCF_RESKEY_rpcpipefs_dir "; then
# systemd
case $EXEC_MODE in
[23])
nfs_exec stop rpc-gssd > /dev/null 2>&1
ocf_log info "Stop: rpc-gssd"
esac
fi

unbind_tree
rc=$?
Expand All @@ -1017,7 +1023,7 @@ nfsserver_stop ()
ocf_log info "NFS server stopped"
fi

if $systemd_is_running; then
if [ $systemd_running -eq 0 ]; then
remove_unshare_uts_dropins
fi

Expand Down Expand Up @@ -1057,7 +1063,7 @@ nfsserver_validate ()
}

nfsserver_validate
systemd_is_running && systemd_is_running=true || systemd_is_running=false
systemd_is_running; systemd_running=$?

case $__OCF_ACTION in
start) nfsserver_start
Expand Down