[SCM] CTDB repository - branch master updated - ctdb-1.12-3-gb6a9dac

[Ronnie Sahlberg]

The branch, master has been updated
       via  b6a9dacefd8f031677702f0fbf6b321beb4c4d54 (commit)
       via  1341329f6125d491b82c873f793af819e677f714 (commit)
       via  56160eccb62178f645b017b1257677a1e854b2bc (commit)
      from  bda24b7f313289404b68ce8b9177fbd6b6a05dd7 (commit)

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


- Log -----------------------------------------------------------------
commit b6a9dacefd8f031677702f0fbf6b321beb4c4d54
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Oct 15 19:50:12 2011 +0200

    config can be in /etc/default/ instead of /etc/sysconfig/ (ctdb_gnostics part)

commit 1341329f6125d491b82c873f793af819e677f714
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Oct 15 19:42:45 2011 +0200

    config can be in /etc/default/ instead of /etc/sysconfig/
    
    ... on Debian system and derivated.
    
    (ctdb_diagnostics still hardcodes /etc/sysconfig/)

commit 56160eccb62178f645b017b1257677a1e854b2bc
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Oct 13 20:26:05 2011 +0200

    config/functions: CTDB_VARDIR is /var/lib/ctdb on Debian-like systems

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

Summary of changes:
 config/ctdb-crash-cleanup.sh   |    2 +-
 config/functions               |    6 +++++-
 tests/complex/31_nfs_tickle.sh |    8 +++++++-
 tests/eventscripts/common.sh   |    8 +++++++-
 tools/ctdb_diagnostics         |    7 +++++--
 5 files changed, 25 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb-crash-cleanup.sh b/config/ctdb-crash-cleanup.sh
index 420db76..f7ccfc8 100755
--- a/config/ctdb-crash-cleanup.sh
+++ b/config/ctdb-crash-cleanup.sh
@@ -22,7 +22,7 @@ ctdb status 2>/dev/null && {
     exit 0
 }
 
-(cat /etc/sysconfig/ctdb | egrep "^CTDB_NATGW_PUBLIC_IP" | sed -e "s/.*=//" -e "s/\/.*//";cat "$CTDB_PUBLIC_ADDRESSES" | cut -d/ -f1) | while read _IP; do
+(cat /etc/{sysconfig,default}/ctdb | egrep "^CTDB_NATGW_PUBLIC_IP" | sed -e "s/.*=//" -e "s/\/.*//";cat "$CTDB_PUBLIC_ADDRESSES" | cut -d/ -f1) | while read _IP; do
 	_IP_HELD=`/sbin/ip addr show | grep "inet $_IP/"`
 	[ -z "$_IP_HELD" ] || {
 		_IFACE=`echo $_IP_HELD | sed -e "s/.*\s//"`
diff --git a/config/functions b/config/functions
index c1891ba..7c5c1c2 100755
--- a/config/functions
+++ b/config/functions
@@ -5,7 +5,11 @@
 PATH=/bin:/usr/bin:/usr/sbin:/sbin:$PATH
 
 [ -z "$CTDB_VARDIR" ] && {
-    export CTDB_VARDIR="/var/ctdb"
+    if [ -d "/var/lib/ctdb" ] ; then
+	export CTDB_VARDIR="/var/lib/ctdb"
+    else
+	export CTDB_VARDIR="/var/ctdb"
+    fi
 }
 [ -z "$CTDB_ETCDIR" ] && {
     export CTDB_ETCDIR="/etc"
diff --git a/tests/complex/31_nfs_tickle.sh b/tests/complex/31_nfs_tickle.sh
index 030e34f..dcbd4d7 100755
--- a/tests/complex/31_nfs_tickle.sh
+++ b/tests/complex/31_nfs_tickle.sh
@@ -83,7 +83,13 @@ sleep_for "${out#*= }"
 
 if try_command_on_node any "test -r /etc/ctdb/events.d/61.nfstickle" ; then
     echo "Trying to determine NFS_TICKLE_SHARED_DIRECTORY..."
-    f="/etc/sysconfig/nfs"
+    if [ -f /etc/sysconfig/nfs ]; then
+	f="/etc/sysconfig/nfs"
+    elif [ -f /etc/default/nfs ]; then
+	f="/etc/default/nfs"
+    elif [ -f /etc/ctdb/sysconfig/nfs ]; then
+	f="/etc/ctdb/sysconfig/nfs"
+    fi
     try_command_on_node -v any "[ -r $f ] &&  sed -n -e s@^NFS_TICKLE_SHARED_DIRECTORY=@@p $f" || true
 
     nfs_tickle_shared_directory="${out:-/gpfs/.ctdb/nfs-tickles}"
diff --git a/tests/eventscripts/common.sh b/tests/eventscripts/common.sh
index 9003b39..a79c293 100644
--- a/tests/eventscripts/common.sh
+++ b/tests/eventscripts/common.sh
@@ -460,7 +460,13 @@ rpc_set_service_failure_response ()
     # the flexibility to set the number of failures.
     _numfails="${2:-${iteration}}"
 
-    _c="${CTDB_ETCDIR}/sysconfig/nfs"
+    if [ -f /etc/sysconfig/nfs ]; then
+	_c="${CTDB_ETCDIR}/sysconfig/nfs"
+    elif [ -f /etc/default/nfs ]; then
+	_c="${CTDB_ETCDIR}/default/nfs"
+    elif [ -f /etc/ctdb/sysconfig/nfs ]; then
+	_c="${CTDB_ETCDIR}/ctdb/sysconfig/nfs"
+    fi
     if [ -r "$_c" ] ; then
 	. "$_c"
     fi
diff --git a/tools/ctdb_diagnostics b/tools/ctdb_diagnostics
index 117def8..e2efb53 100755
--- a/tools/ctdb_diagnostics
+++ b/tools/ctdb_diagnostics
@@ -71,7 +71,11 @@ PATH="$PATH:/sbin:/usr/sbin:/usr/lpp/mmfs/bin"
 
 # list of config files that must exist and that we check are the same 
 # on the nodes
-CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/sysconfig/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+if [ -d /etc/sysconfig ] ; then
+    CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/sysconfig/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+else
+    CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/default/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/default/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+fi
 
 # list of config files that may exist and should be checked that they
 # are the same on the nodes
@@ -115,7 +119,6 @@ show_and_compare_files () {
     fmt="$1" ; shift
 
     for f ; do
-
 	first=true
 
 	for n in $nodes ; do


-- 
CTDB repository