try to restart NFS LOCKD if it failed to start

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index cd5219aa5753c2e6dccaa21a86462840ed80d0fc..ed96ab87e74fbf4684173efcf5ccaf30165e9a5d 100755 (executable)
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -79,7 +79,12 @@ case "$1" in
        } || exit $?
 
        # check that lockd responds to rpc requests
-       ctdb_check_rpc "lockd" 100021 1
+       (ctdb_check_rpc "lockd" 100021 1)
+       [ $? = "0" ] || {
+               echo "Trying to restart lock manager service"
+               startstop_nfslock restart
+               exit 1
+       }
 
        # mount needs special handling since it is sometimes not started
        # correctly on RHEL5

diff --git a/config/functions b/config/functions
index 9771905e34a23e3c2887b8753cde73bba69d986e..9659d48dbe316f0d552d79fa8f3dac17673c5dc6 100755 (executable)
--- a/config/functions
+++ b/config/functions
@@ -417,6 +417,10 @@ startstop_nfslock() {
                stop)
                        service nfsserver stop > /dev/null 2>&1
                        ;;
+               restart)
+                       service nfsserver stop
+                       service nfsserver start
+                       ;;
                esac
                ;;
        rhel)
@@ -427,6 +431,10 @@ startstop_nfslock() {
                stop)
                        service nfslock stop > /dev/null 2>&1
                        ;;
+               restart)
+                       service nfslock stop
+                       service nfslock start
+                       ;;
                esac
                ;;
        *)