]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-scripts: Reformat with shfmt -w -p -i 0 -fn
authorMartin Schwenke <mschwenke@ddn.com>
Mon, 19 Feb 2024 01:56:46 +0000 (12:56 +1100)
committerVolker Lendecke <vl@samba.org>
Thu, 30 May 2024 11:42:30 +0000 (11:42 +0000)
Tweak some lines to avoid overflowing 80 columns.

Best viewed with "git show -w".

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
ctdb/config/events/legacy/60.nfs.script

index 001140611a25843c70fd80af354df06be88c07dc..727aa9cb529d6b96d65d353dd98d1d3d69ace8e3 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to manage nfs in a clustered environment
 
-[ -n "$CTDB_BASE" ] || \
+[ -n "$CTDB_BASE" ] ||
        CTDB_BASE=$(d=$(dirname "$0") && cd -P "$d" && dirname "$PWD")
 
 . "${CTDB_BASE}/functions"
@@ -16,14 +16,14 @@ ctdb_setup_state_dir "service" "$service_name"
 
 ######################################################################
 
-service_reconfigure ()
+service_reconfigure()
 {
-    # Restart lock manager, notify clients
-    # shellcheck disable=SC2317
-    # Called indirectly via check_thresholds()
-    if [ -x "${CTDB_BASE}/statd-callout" ] ; then
-       "${CTDB_BASE}/statd-callout" notify &
-    fi >/dev/null 2>&1
+       # Restart lock manager, notify clients
+       # shellcheck disable=SC2317
+       # Called indirectly via check_thresholds()
+       if [ -x "${CTDB_BASE}/statd-callout" ]; then
+               "${CTDB_BASE}/statd-callout" notify &
+       fi >/dev/null 2>&1
 }
 
 ######################################################################
@@ -34,19 +34,19 @@ service_reconfigure ()
 # Use .check files in $CTDB_NFS_CHECKS_DIR.
 # Default is "${CTDB_BASE}/nfs-checks.d/"
 ######################################################
-nfs_check_services ()
+nfs_check_services()
 {
-    _dir="${CTDB_NFS_CHECKS_DIR:-${CTDB_BASE}/nfs-checks.d}"
+       _dir="${CTDB_NFS_CHECKS_DIR:-${CTDB_BASE}/nfs-checks.d}"
 
-    # Files must end with .check - avoids editor backups, RPM fu, ...
-    for _f in "$_dir"/[0-9][0-9].*.check ; do
-       [ -r "$_f" ] || continue
+       # Files must end with .check - avoids editor backups, RPM fu, ...
+       for _f in "$_dir"/[0-9][0-9].*.check; do
+               [ -r "$_f" ] || continue
 
-       _t="${_f%.check}"
-       _progname="${_t##*/[0-9][0-9].}"
+               _t="${_f%.check}"
+               _progname="${_t##*/[0-9][0-9].}"
 
-       nfs_check_service "$_progname" <"$_f"
-    done
+               nfs_check_service "$_progname" <"$_f"
+       done
 }
 
 ######################################################
@@ -84,169 +84,177 @@ nfs_check_services ()
 # Quoting in values is not preserved
 #
 ######################################################
-nfs_check_service ()
+nfs_check_service()
 {
-    _progname="$1"
-
-    # This sub-shell is created to intentionally limit the scope of
-    # variable values read from the .check files.
-    # shellcheck disable=SC2030
-    (
-       # Subshell to restrict scope variables...
-
-       # Defaults
-       family="tcp"
-       version=""
-       unhealthy_after=1
-       restart_every=0
-       service_stop_cmd=""
-       service_start_cmd=""
-       service_check_cmd=""
-       service_debug_cmd=""
-
-       # Eval line-by-line.  Expands variable references in values.
-       # Also allows variable name checking, which seems useful.
-       while read _line ; do
-           case "$_line" in
-               \#*|"") : ;; # Ignore comments, blank lines
-
-               family=*|version=*|\
-               unhealthy_after=*|restart_every=*|\
-               service_stop_cmd=*|service_start_cmd=*|\
-               service_check_cmd=*|service_debug_cmd=*)
-
-                   eval "$_line"
-                   ;;
-               *)
-                   echo "ERROR: Unknown variable for ${_progname}: ${_line}"
-                   exit 1
-           esac
-       done
-
-       _ok=false
-       if [ -n "$service_check_cmd" ] ; then
-           # Using eval means variables can contain semicolon separated commands
-           if eval "$service_check_cmd" ; then
-               _ok=true
-           else
-               _err="monitoring service \"${_progname}\" failed"
-           fi
-       else
-           if nfs_check_rpcinfo \
-                  "$_progname" "$version" "$family" >/dev/null ; then
-               _ok=true
-           else
-               _err="$ctdb_check_rpc_out"
-           fi
-       fi
+       _progname="$1"
+
+       # This sub-shell is created to intentionally limit the scope of
+       # variable values read from the .check files.
+       # shellcheck disable=SC2030
+       (
+               # Subshell to restrict scope variables...
+
+               # Defaults
+               family="tcp"
+               version=""
+               unhealthy_after=1
+               restart_every=0
+               service_stop_cmd=""
+               service_start_cmd=""
+               service_check_cmd=""
+               service_debug_cmd=""
+
+               # Eval line-by-line.  Expands variable references in values.
+               # Also allows variable name checking, which seems useful.
+               while read _line; do
+                       case "$_line" in
+                       \#* | "") : ;; # Ignore comments, blank lines
+
+                       family=* | version=* | \
+                               unhealthy_after=* | restart_every=* | \
+                               service_stop_cmd=* | service_start_cmd=* | \
+                               service_check_cmd=* | service_debug_cmd=*)
+
+                               eval "$_line"
+                               ;;
+                       *)
+                               printf 'ERROR: Unknown variable for %s: %s\n' \
+                                       "$_progname" "$_line"
+                               exit 1
+                               ;;
+                       esac
+               done
+
+               _ok=false
+               if [ -n "$service_check_cmd" ]; then
+                       # Using eval means variables can contain
+                       # semicolon separated commands
+                       if eval "$service_check_cmd"; then
+                               _ok=true
+                       else
+                               _err="monitoring service \"${_progname}\" failed"
+                       fi
+               else
+                       if nfs_check_rpcinfo \
+                               "$_progname" "$version" "$family" \
+                               >/dev/null; then
+                               _ok=true
+                       else
+                               _err="$ctdb_check_rpc_out"
+                       fi
+               fi
 
-       if $_ok ; then
-           if [ $unhealthy_after -ne 1 ] || [ $restart_every -ne 0 ] ; then
-               ctdb_counter_init "$_progname"
-           fi
-           exit 0
-       fi
+               if $_ok; then
+                       if [ $unhealthy_after -ne 1 ] ||
+                               [ $restart_every -ne 0 ]; then
+                               ctdb_counter_init "$_progname"
+                       fi
+                       exit 0
+               fi
 
-       ctdb_counter_incr "$_progname"
-       _failcount=$(ctdb_counter_get "$_progname")
+               ctdb_counter_incr "$_progname"
+               _failcount=$(ctdb_counter_get "$_progname")
 
-       _unhealthy=false
-       if [ "$unhealthy_after" -gt 0 ] ; then
-           if [ "$_failcount" -ge "$unhealthy_after" ] ; then
-               _unhealthy=true
-               echo "ERROR: $_err"
-           fi
-       fi
+               _unhealthy=false
+               if [ "$unhealthy_after" -gt 0 ]; then
+                       if [ "$_failcount" -ge "$unhealthy_after" ]; then
+                               _unhealthy=true
+                               echo "ERROR: $_err"
+                       fi
+               fi
 
-       if [ "$restart_every" -gt 0 ] ; then
-           if [ $((_failcount % restart_every)) -eq 0 ] ; then
-               if ! $_unhealthy ; then
-                   echo "WARNING: $_err"
+               if [ "$restart_every" -gt 0 ]; then
+                       if [ $((_failcount % restart_every)) -eq 0 ]; then
+                               if ! $_unhealthy; then
+                                       echo "WARNING: $_err"
+                               fi
+                               nfs_restart_service
+                       fi
                fi
-               nfs_restart_service
-           fi
-       fi
 
-       if $_unhealthy ; then
-           exit 1
-       fi
+               if $_unhealthy; then
+                       exit 1
+               fi
 
-       return 0
-    ) || exit 1
+               return 0
+       ) || exit 1
 }
 
 # Uses: service_stop_cmd, service_start_cmd, service_debug_cmd
 # This function is called within the sub-shell that shellcheck thinks
 # loses the above variable values.
 # shellcheck disable=SC2031
-nfs_restart_service ()
+nfs_restart_service()
 {
-    if [ -z "$service_stop_cmd" ] || [ -z "$service_start_cmd" ] ; then
-       die "ERROR: Can not restart service \"${_progname}\" without corresponding service_start_cmd/service_stop_cmd settings"
-    fi
-
-    echo "Trying to restart service \"${_progname}\"..."
-    # Using eval means variables can contain semicolon separated commands
-    eval "$service_stop_cmd"
-    if [ -n "$service_debug_cmd" ] ; then
-       eval "$service_debug_cmd"
-    fi
-    background_with_logging eval "$service_start_cmd"
+       if [ -z "$service_stop_cmd" ] || [ -z "$service_start_cmd" ]; then
+               die "ERROR: Can not restart service \"${_progname}\" without corresponding service_start_cmd/service_stop_cmd settings"
+       fi
+
+       echo "Trying to restart service \"${_progname}\"..."
+       # Using eval means variables can contain semicolon separated commands
+       eval "$service_stop_cmd"
+       if [ -n "$service_debug_cmd" ]; then
+               eval "$service_debug_cmd"
+       fi
+       background_with_logging eval "$service_start_cmd"
 }
 
 ######################################################
 # Check an RPC service with rpcinfo
 ######################################################
-ctdb_check_rpc ()
+ctdb_check_rpc()
 {
-    _progname="$1"        # passed to rpcinfo (looked up in /etc/rpc)
-    _version="$2"         # optional, not passed if empty/unset
-    _family="${3:-tcp}"   # optional, default is "tcp"
-
-    case "$_family" in
-       tcp6|udp6)
-           _localhost="${CTDB_RPCINFO_LOCALHOST6:-::1}"
-           ;;
+       _progname="$1"      # passed to rpcinfo (looked up in /etc/rpc)
+       _version="$2"       # optional, not passed if empty/unset
+       _family="${3:-tcp}" # optional, default is "tcp"
+
+       case "$_family" in
+       tcp6 | udp6)
+               _localhost="${CTDB_RPCINFO_LOCALHOST6:-::1}"
+               ;;
        *)
-           _localhost="${CTDB_RPCINFO_LOCALHOST:-127.0.0.1}"
-    esac
-
-    # $_version is not quoted because it is optional
-    # shellcheck disable=SC2086
-    if ! ctdb_check_rpc_out=$(rpcinfo -T "$_family" "$_localhost" \
-                                     "$_progname" $_version 2>&1) ; then
-       ctdb_check_rpc_out="$_progname failed RPC check:
+               _localhost="${CTDB_RPCINFO_LOCALHOST:-127.0.0.1}"
+               ;;
+       esac
+
+       # $_version is not quoted because it is optional
+       # shellcheck disable=SC2086
+       if ! ctdb_check_rpc_out=$(rpcinfo -T "$_family" "$_localhost" \
+               "$_progname" $_version 2>&1); then
+               ctdb_check_rpc_out="$_progname failed RPC check:
 $ctdb_check_rpc_out"
-       echo "$ctdb_check_rpc_out"
-       return 1
-    fi
+               echo "$ctdb_check_rpc_out"
+               return 1
+       fi
 }
 
-nfs_check_rpcinfo ()
+nfs_check_rpcinfo()
 {
-    _progname="$1"        # passed to rpcinfo (looked up in /etc/rpc)
-    _versions="$2"        # optional, space separated, not passed if empty/unset
-    _families="${3:-tcp}" # optional, space separated, default is "tcp"
-
-    for _family in $_families ; do
-       if [ -n "$_versions" ] ; then
-           for _version in $_versions ; do
-               ctdb_check_rpc "$_progname" "$_version" "$_family" || return $?
-           done
-       else
-           ctdb_check_rpc "$_progname" "" "$_family" || return $?
-       fi
-    done
+       _progname="$1"        # passed to rpcinfo (looked up in /etc/rpc)
+       _versions="$2"        # optional, space separated, not passed if empty/unset
+       _families="${3:-tcp}" # optional, space separated, default is "tcp"
+
+       for _family in $_families; do
+               if [ -n "$_versions" ]; then
+                       for _version in $_versions; do
+                               ctdb_check_rpc \
+                                       "$_progname" "$_version" "$_family" ||
+                                       return $?
+                       done
+               else
+                       ctdb_check_rpc "$_progname" "" "$_family" || return $?
+               fi
+       done
 }
 
 ##################################################################
 # use statd-callout to update NFS lock info
 ##################################################################
-nfs_update_lock_info ()
+nfs_update_lock_info()
 {
-    if [ -x "$CTDB_BASE/statd-callout" ] ; then
-       "$CTDB_BASE/statd-callout" update
-    fi
+       if [ -x "$CTDB_BASE/statd-callout" ]; then
+               "$CTDB_BASE/statd-callout" update
+       fi
 }
 
 ######################################################################
@@ -279,7 +287,7 @@ releaseip)
        ;;
 
 ipreallocated)
-       if ctdb_service_needs_reconfigure ; then
+       if ctdb_service_needs_reconfigure; then
                ctdb_service_reconfigure
        fi
        ;;
@@ -288,9 +296,9 @@ monitor)
        nfs_callout "monitor-pre" || exit $?
 
        # Check that directories for shares actually exist
-       if [ "$CTDB_NFS_SKIP_SHARE_CHECK" != "yes" ] ; then
-           nfs_callout "monitor-list-shares" | ctdb_check_directories || \
-               exit $?
+       if [ "$CTDB_NFS_SKIP_SHARE_CHECK" != "yes" ]; then
+               nfs_callout "monitor-list-shares" | ctdb_check_directories ||
+                       exit $?
        fi
 
        update_tickles 2049
@@ -299,7 +307,7 @@ monitor)
        nfs_check_services
 
        nfs_callout "monitor-post" || exit $?
-               ;;
+       ;;
 esac
 
 exit 0