ctdb-scripts: NFS RPC checks should be simple and consistent
authorMartin Schwenke <martin@meltin.net>
Wed, 17 Jun 2015 09:35:21 +0000 (19:35 +1000)
committerAmitay Isaacs <amitay@samba.org>
Tue, 14 Jul 2015 07:57:17 +0000 (09:57 +0200)
commit6f3ee81d17f6b0eba05b8f14ac1d592c85e916b1
treeaff02abf800174526eb40983f1a479ac84e9e09e
parenta04ccedd244033d3bfd4c644ad94a442eba59559
ctdb-scripts: NFS RPC checks should be simple and consistent

Change status, nlockmgr, mountd, rquotad to be unhealthy after 6
rpcinfo check failures and do a verbose restart after every 2
failures.  Change 60.ganesha for consistency, since 60.ganesha tests
are broken and depend on the consistency.

Apart from the consistency aspect, the check infrastructure will soon
be simplified so that it only allows the equivalent of "unhealthy" and
"verbose restart:b" actions.

Update tests to have a corresponding numbers of iterations.  Run 1
extra iteration in most tests to check there are no unexpected
behaviour changes after the designated number of iterations completes.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
15 files changed:
ctdb/config/events.d/60.ganesha
ctdb/config/nfs-rpc-checks.d/10.statd.check
ctdb/config/nfs-rpc-checks.d/30.lockd.check
ctdb/config/nfs-rpc-checks.d/40.mountd.check
ctdb/config/nfs-rpc-checks.d/50.rquotad.check
ctdb/tests/eventscripts/60.ganesha.monitor.131.sh
ctdb/tests/eventscripts/60.nfs.monitor.121.sh
ctdb/tests/eventscripts/60.nfs.monitor.122.sh
ctdb/tests/eventscripts/60.nfs.monitor.131.sh
ctdb/tests/eventscripts/60.nfs.monitor.132.sh
ctdb/tests/eventscripts/60.nfs.monitor.141.sh
ctdb/tests/eventscripts/60.nfs.monitor.142.sh
ctdb/tests/eventscripts/60.nfs.monitor.144.sh
ctdb/tests/eventscripts/60.nfs.monitor.152.sh
ctdb/tests/eventscripts/60.nfs.monitor.153.sh