1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00

ctdb-scripts: Add registration for CTDB_NFS_CALLOUT operations

This is an optimisation to avoid forking the callout for operations
that are not implemented.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2015-07-14 12:11:39 +10:00 committed by Amitay Isaacs
parent 3b32c64189
commit fa6f22d7ae
3 changed files with 45 additions and 6 deletions

View File

@ -7,6 +7,10 @@
. $CTDB_BASE/functions
service_name="nfs"
loadconfig
ctdb_setup_service_state_dir
######################################################################
if [ -z "$CTDB_NFS_CALLOUT" ] ; then
CTDB_NFS_CALLOUT="${CTDB_BASE}/nfs-linux-kernel-callout"
@ -14,9 +18,44 @@ fi
# Always export, for statd callout
export CTDB_NFS_CALLOUT
nfs_callout_cache="${service_state_dir}/nfs_callout_cache"
nfs_callout_cache_callout="${nfs_callout_cache}/CTDB_NFS_CALLOUT"
nfs_callout_cache_ops="${nfs_callout_cache}/ops"
nfs_callout_register ()
{
mkdir -p "$nfs_callout_cache_ops"
rm -f "$nfs_callout_cache_ops"/*
echo "$CTDB_NFS_CALLOUT" >"$nfs_callout_cache_callout"
_t=$(eval "$CTDB_NFS_CALLOUT" "register")
if [ -n "$_t" ] ; then
echo "$_t" |
while IFS="" read _op ; do
touch "${nfs_callout_cache_ops}/${_op}"
done
else
touch "${nfs_callout_cache_ops}/ALL"
fi
}
nfs_callout ()
{
eval "$CTDB_NFS_CALLOUT" "$@"
# Re-run registration if $CTDB_NFS_CALLOUT has changed
_prev=""
if [ -r "$nfs_callout_cache_callout" ] ; then
read _prev <"$nfs_callout_cache_callout"
fi
if [ "$CTDB_NFS_CALLOUT" != "$_prev" ] ; then
nfs_callout_register
fi
# Run the operation if it is registered...
if [ -e "${nfs_callout_cache_ops}/${1}" ] || \
[ -e "${nfs_callout_cache_ops}/ALL" ]; then
eval "$CTDB_NFS_CALLOUT" "$@"
fi
}
service_reconfigure ()
@ -234,10 +273,6 @@ nfs_update_lock_info ()
######################################################################
loadconfig
ctdb_setup_service_state_dir
ctdb_start_stop_service
is_ctdb_managed_service || exit 0

View File

@ -290,7 +290,7 @@ case "$action" in
releaseip) nfs_releaseip "$@" ;;
takeip) nfs_takeip "$@" ;;
monitor-list-shares) nfs_monitor_list_shares ;;
monitor-pre|monitor-post)
register|monitor-pre|monitor-post)
# Not required/implemented
:
;;

View File

@ -32,6 +32,7 @@ usage ()
usage: $_c { shutdown | startup }
$_c { stop | start } { nfs | nlockmgr }
$_c { monitor-list-shares | monitor-post }
$_c { register }
EOF
exit 1
}
@ -196,6 +197,9 @@ case "$1" in
monitor-post)
nfs_check_thread_count
;;
register)
: # Nothing yet
;;
monitor-pre|releaseip|takeip)
# Not required/implemented
: