[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-145-g02e26fd
Ronnie Sahlberg
sahlberg at samba.org
Mon Oct 4 22:01:53 MDT 2010
The branch, 1.0.112 has been updated
via 02e26fd7c4fed1af485c2a94eb34254809cb401e (commit)
via 9ceae8fedc2f439791b2018ba5567a965af2712d (commit)
from 4a7d634f2bde9b3a84fd4a034045245a220f7589 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.112
- Log -----------------------------------------------------------------
commit 02e26fd7c4fed1af485c2a94eb34254809cb401e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Oct 5 15:00:52 2010 +1100
New version 1.0.112-36
Updates to ctdb_diagnostics
commit 9ceae8fedc2f439791b2018ba5567a965af2712d
Author: Martin Schwenke <martin at meltin.net>
Date: Fri Aug 6 11:10:56 2010 +1000
Add some command-line options to ctdb_diagnostics.
In some contexts ctdb_diagnostics generates too many errors when it is
run on heterogeneous and machine-configured clusters. In some
clusters some nodes are expected to be differently configured and also
machine-generated configured files can have comments containing
timestamps.
This adds some command-line options that can be used to reduce the
number of errors reported:
-n <nodes> Comma separated list of nodes to operate on
-c Ignore comment lines (starting with '#') in file comparisons
-w Ignore whitespace in file comparisons
--no-ads Do not use commands that assume an Active Directory Server
The -n option simply allows ctdb_diagnostics to operate on a subset of
nodes, avoiding file comparisons with and data collection on nodes
that are differently configured. For file comparisons, instead of
showing each file on the current node and then comparing other nodes
to that file, the file from the first (available or requested) nodes
is shown and then other nodes are compared to that. That has resulted
in changes in output - that is, ctdb diagnostics no longer prints
messages referencing the current node.
-c and -w are used to weaken comparisons between configuration files.
--no-ads can be used to avoid running ADS-specific commands if a
cluster uses LDAP (or other non-ADS) configuration.
This also fixes a number of bugs in related code:
* A call to onnode was losing the >> NODE ... << lines because they
now go to stderr. This was changed in onnode long ago but
ctdb_diagnostics was never updated to match.
* ctdb_diagnostics was counting lines in /etc/ctdb/nodes to determine
what nodes to operate on. For some time the nodes file has
supported syntax that makes this invalid. "ctdb listnodes -Y" is
now used to list available nodes.
Signed-off-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/ctdb.spec.in | 4 +-
tools/ctdb_diagnostics | 163 ++++++++++++++++++++++++++++++++------------
2 files changed, 121 insertions(+), 46 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 83a9c04..9259feb 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: ctdb
Version: 1.0.112
-Release: 35
+Release: 36
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -125,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/ctdb/tests/bin/ctdb_transaction
%changelog
+* Tue Oct 5 2010 : Version 1.0.112-36
+ - Updates and bugfixes to ctdb_diagnostincs
* Fri Oct 1 2010 : Version 1.0.112-35
- Fix futex hang during eventscript timeout
- Fix a crash when printing a log message during shutdown
diff --git a/tools/ctdb_diagnostics b/tools/ctdb_diagnostics
index 2cdf3cc..eae5483 100755
--- a/tools/ctdb_diagnostics
+++ b/tools/ctdb_diagnostics
@@ -1,15 +1,60 @@
#!/bin/sh
# a script to test the basic setup of a CTDB/Samba install
# tridge at samba.org September 2007
+# martin at meltin.net August 2010
+
+usage ()
+{
+ cat >&2 <<EOF
+Usage: ctdb_diagnostics [OPTION] ...
+ options:
+ -n <nodes> Comma separated list of nodes to operate on
+ -c Ignore comment lines (starting with '#') in file comparisons
+ -w Ignore whitespace in file comparisons
+ --no-ads Do not use commands that assume an Active Directory Server
+EOF
+ exit 1
+
+}
+
+nodes=$(ctdb listnodes -Y | cut -d: -f2)
+diff_opts=
+no_ads=false
+
+parse_options ()
+{
+ temp=$(getopt -n "ctdb_diagnostics" -o "n:cwh" -l no-ads,help -- "$@")
+
+ [ $? != 0 ] && usage
+
+ eval set -- "$temp"
+
+ while true ; do
+ case "$1" in
+ -n) nodes=$(echo "$2" | sed -e 's@,@ @g') ; shift 2 ;;
+ -c) diff_opts="${diff_opts} -I ^#.*" ; shift ;;
+ -w) diff_opts="${diff_opts} -w" ; shift ;;
+ --no-ads) no_ads=true ; shift ;;
+ --) shift ; break ;;
+ -h|--help|*) usage ;;
+ esac
+ done
+
+ [ $# -ne 0 ] && usage
+}
+
+parse_options "$@"
+
+nodes_comma=$(echo $nodes | sed -e 's@[[:space:]]@, at g')
PATH="$PATH:/sbin:/usr/sbin:/usr/lpp/mmfs/bin"
# list of config files that must exist and that we check are the same
-# on all nodes
+# 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"
# list of config files that may exist and should be checked that they
-# are the same on all nodes
+# are the same on the nodes
CONFIG_FILES_MAY="/etc/ctdb/public_addresses /etc/ctdb/static-routes"
2>&1
@@ -41,67 +86,83 @@ show_file() {
}
show_all() {
- echo "running $1 on all nodes"
- onnode all "hostname; date; $1 2>&1 | sed 's/^/ /'"
+ echo "running $1 on nodes $nodes_comma"
+ onnode $nodes_comma "hostname; date; $1 2>&1 | sed 's/^/ /'" 2>&1
+}
+
+show_and_compare_files () {
+
+ fmt="$1" ; shift
+
+ for f ; do
+
+ first=true
+
+ for n in $nodes ; do
+
+ if $first ; then
+ onnode $n [ -r "$f" ] || {
+ msg=$(printf "$fmt" "$f" $n)
+ error "$msg"
+ continue 2;
+ }
+
+ fstf=/tmp/`basename $f`.node$n
+ onnode $n cat $f > $fstf 2>&1
+
+ echo " ================================"
+ echo " File (on node $n): $f"
+ echo " `onnode $n ls -l $f 2>&1`"
+ cat "$fstf" | sed 's/^/ /'
+ echo " ================================"
+ first=false
+ else
+ echo "Testing for same config file $f on node $n"
+ tmpf=/tmp/`basename $f`.node$n
+ onnode $n cat $f > $tmpf 2>&1
+ diff $diff_opts $fstf $tmpf >/dev/null 2>&1 || {
+ error "File $f is different on node $n"
+ diff -u $diff_opts $fstf $tmpf
+ }
+ rm -f $tmpf
+ fi
+ done
+
+ rm -f $fstf
+ done
}
ERRORS="/tmp/diag_err.$$"
-NUM_NODES=`wc -l < /etc/ctdb/nodes`
-MAX_NODE=`expr $NUM_NODES - 1`
NUM_ERRORS=0
+
cat <<EOF
-Diagnosis started on a $NUM_NODES node cluster. The following node list will be used:
+Diagnosis started on these nodes:
+$nodes_comma
+
+For reference, here is the nodes file on the current node...
EOF
show_file /etc/ctdb/nodes
cat <<EOF
--------------------------------------------------------------------
-Comping critical config files on all nodes
+Comping critical config files on nodes $nodes_comma
EOF
-for f in $CONFIG_FILES_MUST; do
- [ -r "$f" ] || {
- error "$f is missing on this node"
- continue;
- }
- show_file $f
- for i in `seq 0 $MAX_NODE`; do
- echo "Testing for same config file $f on node $i"
- tmpf=/tmp/`basename $f`.node$i
- onnode $i cat $f > $tmpf 2>&1
- cmp $f $tmpf 2>&1 || {
- error "File $f is different on node $i"
- diff -u $f $tmpf
- }
- rm -f $tmpf
- done
-done
+show_and_compare_files \
+ "%s is missing on node %d" \
+ $CONFIG_FILES_MUST
-for f in $CONFIG_FILES_MAY; do
- [ -r "$f" ] || {
- echo "Optional file $f is not present on local node"
- continue;
- }
- show_file $f
- for i in `seq 0 $MAX_NODE`; do
- echo "Testing for same config file $f on node $i"
- tmpf=/tmp/`basename $f`.node$i
- onnode $i cat $f > $tmpf 2>&1
- cmp $f $tmpf 2>&1 || {
- error "File $f is different on node $i"
- diff -u $f $tmpf
- }
- rm -f $tmpf
- done
-done
+show_and_compare_files \
+ "Optional file %s is not present on node %d" \
+ $CONFIG_FILES_MAY
cat <<EOF
--------------------------------------------------------------------
Checking for clock drift
EOF
t=`date +%s`
-for i in `seq 0 $MAX_NODE`; do
+for i in $nodes; do
t2=`onnode $i date +%s`
d=`expr $t2 - $t`
if [ $d -gt 30 -o $d -lt -30 ]; then
@@ -225,12 +286,24 @@ cat <<EOF
Showing Samba status
EOF
show_all "smbstatus -n -B"
-show_all "net ads testjoin"
+if $no_ads ; then
+ echo
+ echo "Skipping \"net ads testjoin\" as requested"
+ echo
+else
+ show_all "net ads testjoin"
+fi
show_all "net conf list"
show_all "lsof -n | grep smbd"
show_all "lsof -n | grep ctdbd"
show_all "netstat -tan"
-show_all "net ads info"
+if $no_ads ; then
+ echo
+ echo "Skipping \"net ads info\" as requested"
+ echo
+else
+ show_all "net ads info"
+fi
show_all "date"
show_all "smbclient -U% -L 127.0.0.1"
WORKGROUP=`testparm -s --parameter-name=WORKGROUP 2> /dev/null`
--
CTDB repository
More information about the samba-cvs
mailing list