don't start nfs services unless the relevant directories are available

(This used to be ctdb commit e0468d61119b6581f5ec458641568d03714a5786)

diff --git a/ctdb/config/events.d/nfs b/ctdb/config/events.d/nfs
index 10b4fc9e5a26d2ecb1ae844c67a86582fc1b9c0b..b9b5a403da1f3db87152aac90822b32c1627688b 100644 (file)
--- a/ctdb/config/events.d/nfs
+++ b/ctdb/config/events.d/nfs
@@ -13,6 +13,11 @@ shift
 case $cmd in 
      startup)
        mkdir -p /etc/ctdb/state/nfs
+
+       # wait for all nfs exported directories to become available
+       nfs_dirs=`cut -d' ' -f1 /etc/exports`
+       ctdb_wait_directories "NFS" $nfs_dirs
+
        service nfs start
        ;;
 

diff --git a/ctdb/config/events.d/nfslock b/ctdb/config/events.d/nfslock
index 361b8e0ffd56651286cc225e899a8860ef94f4f5..da857ce97c9f4b3a9ac9d86cf7d3c339017455c1 100644 (file)
--- a/ctdb/config/events.d/nfslock
+++ b/ctdb/config/events.d/nfslock
@@ -7,12 +7,16 @@
 [ -z $CTDB_MANAGES_NFS ] && exit 0
 [ $CTDB_MANAGES_NFS != "yes" ] && exit 0
 
+[ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
+
 cmd="$1"
 shift
 
 case $cmd in 
      startup)
        /bin/mkdir -p /etc/ctdb/state/statd/ip
+       ctdb_wait_directories "nfslock" "$STATD_SHARED_DIRECTORY"
+
        service nfslock start
        ;;
 

diff --git a/ctdb/config/events.d/samba b/ctdb/config/events.d/samba
index 0abbed76dbf3e5706c38e2316f2e10951abad37d..5d08213adab65f3c6bdac5acd20d16aa3f090b3e 100644 (file)
--- a/ctdb/config/events.d/samba
+++ b/ctdb/config/events.d/samba
@@ -13,6 +13,10 @@ shift
 
 case $cmd in 
      startup)
+       # wait for all shared directories to become available
+       smb_dirs=`testparm -st 2> /dev/null | egrep '^\s*path = '  | cut -d= -f2`
+       ctdb_wait_directories "Samba" $smb_dirs 
+
        # start Samba service
        service smb start
        service winbind start
@@ -20,10 +24,6 @@ case $cmd in
        # wait for the Samba tcp ports to become available
        smb_ports=`testparm -stv 2> /dev/null | egrep '\s*smb ports =' | cut -d= -f2`
        ctdb_wait_tcp_ports "Samba" $smb_ports
-
-       # wait for all shared directories to become available
-       smb_dirs=`testparm -st 2> /dev/null | egrep '^\s*path = '  | cut -d= -f2`
-       ctdb_wait_directories "Samba" $smb_dirs 
        ;;
        
      takeip)