diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-08-11 07:13:28 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-08-11 07:14:16 +1000 |
| commit | f9156adef5a96c049cef25438810a15fe15f1be1 (patch) | |
| tree | 8bbc7d66e31392bbe1dfe69a22f53dc510d2a4b9 | |
| parent | 65d5c512784ab300fd6832f15441302a7362a69a (diff) | |
| download | samba-f9156adef5a96c049cef25438810a15fe15f1be1.tar.gz samba-f9156adef5a96c049cef25438810a15fe15f1be1.tar.xz samba-f9156adef5a96c049cef25438810a15fe15f1be1.zip | |
check the shares if they are available before we decide to try to restart nfs
CQ S1027529
(This used to be ctdb commit b6c6a4588ccf6ef78fabfd76d228f56b4eb65165)
| -rwxr-xr-x | ctdb/config/events.d/60.nfs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs index 6736a9c8c0..c0207eeaed 100755 --- a/ctdb/config/events.d/60.nfs +++ b/ctdb/config/events.d/60.nfs @@ -47,6 +47,13 @@ case "$1" in ;; monitor) + # and that its directories are available + [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || { + exportfs | grep -v '^#' | grep '^/' | + sed -e 's/[[:space:]]\+[^[:space:]]*$//' | + ctdb_check_directories + } || exit $? + if ctdb_service_needs_reconfigure ; then ctdb_service_reconfigure exit 0 @@ -105,13 +112,6 @@ case "$1" in fi } - # and that its directories are available - [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || { - exportfs | grep -v '^#' | grep '^/' | - sed -e 's/[[:space:]]\+[^[:space:]]*$//' | - ctdb_check_directories - } || exit $? - # check that lockd responds to rpc requests if ctdb_check_rpc "LOCKD" 100021 1 >/dev/null ; then (service_name="lockd"; ctdb_counter_init) |