git.samba.org
/
sahlberg
/
ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c28786
)
check the shares if they are available before we decide to try to restart nfs
author
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Wed, 10 Aug 2011 21:13:28 +0000
(07:13 +1000)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Wed, 10 Aug 2011 21:14:16 +0000
(07:14 +1000)
CQ S1027529
config/events.d/60.nfs
patch
|
blob
|
history
diff --git
a/config/events.d/60.nfs
b/config/events.d/60.nfs
index 6736a9c8c07044b1e06d27354e48304a5c28bf21..c0207eeaeddc5fd947c6b0b6489540231306cb67 100755
(executable)
--- a/
config/events.d/60.nfs
+++ b/
config/events.d/60.nfs
@@
-47,6
+47,13
@@
case "$1" in
;;
monitor)
;;
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
if ctdb_service_needs_reconfigure ; then
ctdb_service_reconfigure
exit 0
@@
-105,13
+112,6
@@
case "$1" in
fi
}
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)
# check that lockd responds to rpc requests
if ctdb_check_rpc "LOCKD" 100021 1 >/dev/null ; then
(service_name="lockd"; ctdb_counter_init)