diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-11-26 11:39:54 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-11-27 18:46:17 +0100 |
| commit | 7a174985ff55c64b875fd1b1e303d83ef836c077 (patch) | |
| tree | 1ea69e03ef699f4787425a051d2113346b2c07b0 /ctdb | |
| parent | 0fe178eb3ae75c08b040813ddb4ed7b8ac3ead44 (diff) | |
| download | samba-7a174985ff55c64b875fd1b1e303d83ef836c077.tar.gz | |
ctdb-eventscripts: Perform share check before NFS RPC checks in 60.ganesha
If NFS RPC checks do restart Ganesha, then it's possible that share
check can fail prematurely.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/config/events.d/60.ganesha | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha index 242321aa35f..6e7d47df339 100755 --- a/ctdb/config/events.d/60.ganesha +++ b/ctdb/config/events.d/60.ganesha @@ -187,6 +187,12 @@ case "$1" in ;; monitor) + # Check that directories for shares actually exist. + [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || { + grep Path /etc/ganesha/$CTDB_CLUSTER_FILESYSTEM_TYPE.ganesha.exports.conf | + cut -f2 -d\" | sort -u | ctdb_check_directories + } || exit $? + update_tickles 2049 # check that statd responds to rpc requests @@ -209,12 +215,6 @@ case "$1" in # not a critical service so we dont flag the node as unhealthy nfs_check_rpc_service "rquotad" \ -gt 0 "verbose restart:b" - - # Check that directories for shares actually exist. - [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || { - grep Path /etc/ganesha/$CTDB_CLUSTER_FILESYSTEM_TYPE.ganesha.exports.conf | - cut -f2 -d\" | ctdb_check_directories - } || exit $? ;; *) |