[SCM] CTDB repository - branch master updated - ctdb-1.0.72-13-gecf26af

[Ronnie Sahlberg]

The branch, master has been updated
       via  ecf26af22245d0f55aded50e8768b0c21495f98c (commit)
       via  432604a1435cd2b5a7178fb5aedf1d4b61bffeb9 (commit)
      from  ef9dc810c4309e8eba18d015c73c1b5d0760a4e8 (commit)

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


- Log -----------------------------------------------------------------
commit ecf26af22245d0f55aded50e8768b0c21495f98c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Mar 4 07:25:26 2009 +1100

    new version 1.0.73

commit 432604a1435cd2b5a7178fb5aedf1d4b61bffeb9
Author: root <root at rcn1.VSOFS1.COM>
Date:   Wed Mar 4 07:21:55 2009 +1100

    Add a variable CTDB_NFS_SKIP_SHARE_CHECK to sysconfig that can disable the check that all shares are accessable.
    This can take very long if there are very many shares and is in that case better to implement in a separate cronjob than in ctdb eventscript

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

Summary of changes:
 config/ctdb.sysconfig   |    1 +
 config/events.d/60.nfs  |    6 ++++--
 packaging/RPM/ctdb.spec |    5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 25c2958..db5d16c 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -46,6 +46,7 @@
 # of them are available during each monitoring interval.
 # In that case this check can be disabled
 # CTDB_SAMBA_SKIP_SHARE_CHECK=yes
+# CTDB_NFS_SKIP_SHARE_CHECK=yes
 
 # specify which ports we should check that there is a daemon listening to
 # by default we use testparm and look in smb.conf to figure out.
diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index b3b0e69..b5cd819 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -98,8 +98,10 @@ case $cmd in
 	ctdb_check_rpc "NFS" 100003 3
 
 	# and that its directories are available
-	nfs_dirs=$(exportfs | grep -v '^#' | grep '^/' | awk {'print $1;'})
-	ctdb_check_directories "nfs" $nfs_dirs
+	[ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || {
+	    nfs_dirs=$(exportfs | grep -v '^#' | grep '^/' | awk {'print $1;'})
+	    ctdb_check_directories "nfs" $nfs_dirs
+	}
 
 	# check that lockd responds to rpc requests
 	ctdb_check_rpc "lockd" 100021 1
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 08c5c90..66ca330 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.72
+Version: 1.0.73
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -128,6 +128,9 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Wed Mar 4 2009 : Version 1.0.73
+ - Add possibility to disable the check of shares for NFS and Samba
+ - From Sumit Bose, fix dependencies so make -j works
 * Wed Feb 18 2009 : Version 1.0.72
  - Updates to test scripts by martin s
  - Adding a COPYING file


-- 
CTDB repository