[SCM] CTDB repository - branch master updated - ctdb-1.10-333-g68ea19c

[Ronnie Sahlberg]

The branch, master has been updated
       via  68ea19cb02017e93769df7f6312d5e0bef55e605 (commit)
       via  b6c6a4588ccf6ef78fabfd76d228f56b4eb65165 (commit)
      from  6c287861e780ba985e7ae7a61c1ee462b925e09e (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 68ea19cb02017e93769df7f6312d5e0bef55e605
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Aug 11 07:14:57 2011 +1000

    increase the persistent timeout to make people happier

commit b6c6a4588ccf6ef78fabfd76d228f56b4eb65165
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Aug 11 07:13:28 2011 +1000

    check the shares if they are available before we decide to try to restart nfs
    
    CQ S1027529

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/60.nfs |   14 +++++++-------
 config/events.d/91.lvs |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 6736a9c..c0207ee 100755
--- a/config/events.d/60.nfs
+++ b/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)
diff --git a/config/events.d/91.lvs b/config/events.d/91.lvs
index ff95811..19cb445 100755
--- a/config/events.d/91.lvs
+++ b/config/events.d/91.lvs
@@ -59,8 +59,8 @@ case "$1" in
 	ip addr del $CTDB_LVS_PUBLIC_IP/32 dev lo >/dev/null 2>/dev/null
 	ip addr add $CTDB_LVS_PUBLIC_IP/32 dev lo >/dev/null 2>/dev/null
 
-	ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 9999 -s lc
-	ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 9999 -s lc
+	ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 999999 -s lc
+	ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 999999 -s lc
 
 	# add all nodes (except ourselves) to the lvs config
 	ctdb lvs | egrep -v "^$PNN:" | sed -e "s/.*://" | while read IP; do


-- 
CTDB repository