Eventscripts: print a message when reconfiguring a service.

[sahlberg/ctdb.git] / config / functions

diff --git a/config/functions b/config/functions
index 5dd31fe09a8883c13f53e7f6135c69b00e29f569..8dac161940da20d5550b76193da8d608cbd95873 100755 (executable)
--- a/config/functions
+++ b/config/functions
@@ -375,7 +375,10 @@ startstop_nfs() {
                        service nfsserver stop > /dev/null 2>&1
                        ;;
                restart)
-                       service nfsserver restart
+                       echo 0 >/proc/fs/nfsd/threads
+                       service nfsserver stop > /dev/null 2>&1
+                       pkill -9 nfsd
+                       service nfsserver start
                        ;;
                esac
                ;;
@@ -390,8 +393,12 @@ startstop_nfs() {
                        service nfslock stop > /dev/null 2>&1
                        ;;
                restart)
-                       service nfslock restart
-                       service nfs restart
+                       echo 0 >/proc/fs/nfsd/threads
+                       service nfs stop > /dev/null 2>&1
+                       service nfslock stop > /dev/null 2>&1
+                       pkill -9 nfsd
+                       service nfslock start
+                       service nfs start
                        ;;
                esac
                ;;
@@ -644,6 +651,7 @@ ctdb_service_unset_reconfigure ()
 
 ctdb_service_reconfigure ()
 {
+    echo "Reconfiguring service \"$service_name\"..."
     if [ -n "$service_reconfigure" ] ; then
        eval $service_reconfigure
     else
@@ -669,11 +677,12 @@ is_ctdb_managed_service ()
     ctdb_compat_managed_service "$CTDB_MANAGES_VSFTPD"   "vsftpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_SAMBA"    "samba"
     ctdb_compat_managed_service "$CTDB_MANAGES_SCP"      "scp"
-    ctdb_compat_managed_service "$CTDB_MANAGES_WINDBIND" "windbind"
+    ctdb_compat_managed_service "$CTDB_MANAGES_WINBIND"  "winbind"
     ctdb_compat_managed_service "$CTDB_MANAGES_HTTPD"    "httpd"
     ctdb_compat_managed_service "$CTDB_MANAGES_ISCSI"    "iscsi"
     ctdb_compat_managed_service "$CTDB_MANAGES_CLAMD"    "clamd"
     ctdb_compat_managed_service "$CTDB_MANAGES_NFS"      "nfs"
+    ctdb_compat_managed_service "$CTDB_MANAGES_NFS"      "nfs-ganesha-gpfs"
 
     # Returns 0 if "<space>$_service_name<space>" appears in $t
     [ "${t#* ${_service_name} }" != "${t}" ]
@@ -684,8 +693,7 @@ ctdb_start_stop_service ()
     _service_name="${1:-${service_name}}"
 
     _active="$ctdb_active_dir/$_service_name"
-
-    if is_ctdb_managed_service ; then
+    if is_ctdb_managed_service "$_service_name"; then
        if ! [ -e "$_active" ] ; then
            echo "Starting service $_service_name"
            ctdb_service_start || exit $?
@@ -693,13 +701,13 @@ ctdb_start_stop_service ()
            touch "$_active"
            exit 0
        fi
-    elif ! is_ctdb_managed_service ; then
+    else
        if [ -e "$_active" ] ; then
            echo "Stopping service $_service_name"
            ctdb_service_stop || exit $?
            rm -f "$_active"
+           exit 0
        fi
-       exit 0
     fi
 }