diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-08-02 16:05:46 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-08-14 15:57:03 +1000 |
| commit | bdbe37b24fef22c795531e1aba81e5baee6e5916 (patch) | |
| tree | 68af683101f05e4fa163f4e28ebc088460e14884 /ctdb/tests/eventscripts | |
| parent | 2afb5632c719bc8bd8569b6af309227401f4d9b4 (diff) | |
| download | samba-bdbe37b24fef22c795531e1aba81e5baee6e5916.tar.gz samba-bdbe37b24fef22c795531e1aba81e5baee6e5916.tar.xz samba-bdbe37b24fef22c795531e1aba81e5baee6e5916.zip | |
eventscripts: Separate out RPC service restart code
While doing this:
* Explicitly assign RPC program and version information in
_nfs_check_rpc_common(). This is more lines of code but is easier
to read.
* Don't print the options when starting a service. Trying to print it
makes the code messy for little benefit.
Update the eventscript unit testing code and a Ganesha test to
reflect this.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit e8b531405665885196c95fe1608db33a255bf761)
Diffstat (limited to 'ctdb/tests/eventscripts')
| -rwxr-xr-x | ctdb/tests/eventscripts/60.ganesha.monitor.141.sh | 4 | ||||
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh b/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh index 656a530728..9cd82f84cc 100755 --- a/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh +++ b/ctdb/tests/eventscripts/60.ganesha.monitor.141.sh @@ -13,7 +13,7 @@ ok_null simple_test || exit $? ok<<EOF -Trying to restart statd [rpc.statd -n cluster1 -H /etc/ctdb/statd-callout ] +Trying to restart statd [rpc.statd] EOF simple_test || exit $? @@ -24,7 +24,7 @@ ok<<EOF ERROR: status failed RPC check: rpcinfo: RPC: Program not registered program status version 1 is not available -Trying to restart statd [rpc.statd -n cluster1 -H /etc/ctdb/statd-callout ] +Trying to restart statd [rpc.statd] EOF simple_test || exit $? diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 594656c413..fafc8f3b2e 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -693,14 +693,8 @@ ERROR: $_pn failed RPC check: rpcinfo: RPC: Program not registered program $_pn version $_ver is not available" ;; - restart|restart:*) - _opts="" + restart*) _p="rpc.${_progname}" - case "$_progname" in - statd) - _opts="${STATD_HOSTNAME:+ -n }${STATD_HOSTNAME}" - ;; - esac case "$_action" in *:b) _bg="&" ;; *) _bg="" ;; @@ -730,7 +724,7 @@ Trying to restart lock manager service ${_bg}Starting nfslock: OK" ;; *) - _t="Trying to restart $_progname [${_p}${_opts}]" + _t="Trying to restart $_progname [${_p}]" esac _out="${_out}${_out:+${_nl}}${_t}" ;; |