eventscripts: Remove support for RPC service 'q' and 's' restart flags

They're hard to maintain and provide very little benefit.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 1a1be43f8466d46913dcdfe6dcedb94316cd28ad)

diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha
index 09860d059132f3a51ee52c461b4d237d1aaca014..70c4cdbc0da6ec6bcce5b30c9379944655b605a3 100755 (executable)
--- a/ctdb/config/events.d/60.ganesha
+++ b/ctdb/config/events.d/60.ganesha
@@ -199,7 +199,7 @@ case "$1" in
            nfs_check_rpc_service "statd" \
                -ge 6 "verbose unhealthy" \
                -eq 4 "verbose restart" \
-               -eq 2 "restart:bs"
+               -eq 2 "restart:b"
 
        if [ "$CTDB_SKIP_GANESHA_NFSD_CHECK" != "yes" ] ; then
            monitor_ganesha_nfsd

diff --git a/ctdb/config/nfs-rpc-checks.d/10.statd.check b/ctdb/config/nfs-rpc-checks.d/10.statd.check
index dd5e15d08ddb42f02c58e69364820471713257f8..d738a3245e5e2575b85b8d3a99d22495607fc29a 100644 (file)
--- a/ctdb/config/nfs-rpc-checks.d/10.statd.check
+++ b/ctdb/config/nfs-rpc-checks.d/10.statd.check
@@ -1,3 +1,3 @@
 -ge 6 verbose unhealthy
 -eq 4 verbose restart
--eq 2 restart:bs
+-eq 2 restart:b

diff --git a/ctdb/config/nfs-rpc-checks.d/20.nfsd.check b/ctdb/config/nfs-rpc-checks.d/20.nfsd.check
index dd5e15d08ddb42f02c58e69364820471713257f8..d738a3245e5e2575b85b8d3a99d22495607fc29a 100644 (file)
--- a/ctdb/config/nfs-rpc-checks.d/20.nfsd.check
+++ b/ctdb/config/nfs-rpc-checks.d/20.nfsd.check
@@ -1,3 +1,3 @@
 -ge 6 verbose unhealthy
 -eq 4 verbose restart
--eq 2 restart:bs
+-eq 2 restart:b

diff --git a/ctdb/config/nfs-rpc-checks.d/30.lockd.check b/ctdb/config/nfs-rpc-checks.d/30.lockd.check
index 4bda6c3071352704b863c3ae872e013689a68f6d..95ae7b34db2772f71bb9e0e4517c52c35c68884c 100644 (file)
--- a/ctdb/config/nfs-rpc-checks.d/30.lockd.check
+++ b/ctdb/config/nfs-rpc-checks.d/30.lockd.check
@@ -1,2 +1,2 @@
 -ge 15 verbose restart:b unhealthy
--eq 10 restart:bs
+-eq 10 restart:b

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 9da17b10fb9f065a38c971f4620cd452ca03cd47..509e14e51d0365c8d36497df9a7eba53624e7d63 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -702,7 +702,7 @@ program $_pn version $_ver is not available"
                                ;;
                        esac
                        case "${_progname}${_action#restart}" in
-                           nfsd)
+                           nfsd*)
                                _t="\
 Trying to restart NFS service"
 
@@ -720,18 +720,14 @@ ${_t}
 Starting nfslock: OK
 Starting nfs: OK"
                                ;;
-                           nfsd:bs)
+                           nfsd:b)
                                _t="Trying to restart NFS service"
                                ;;
                            lockd|lockd:b)
                                _t="\
 Trying to restart lock manager service
-Stopping nfslock: OK
 Starting nfslock: OK"
                                ;;
-                           lockd:*)
-                               _t="Trying to restart lock manager service"
-                               ;;
                            *)
                                _t="Trying to restart $_progname [${_p}${_opts}]"
                        esac