- nice messages while waiting for tcp services to come up

- added more comments to sysconfig file

(This used to be ctdb commit 9cbe7ad147a73cd6594fa7bcee0544fd986ad8c0)

diff --git a/ctdb/packaging/RHEL/setup/ctdb.sysconfig b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
index b0b61e0dec1e8b9445c26f074309a38fe6e3a190..13d83ce1abfff56fa47610201936ccea539ea955 100644 (file)
--- a/ctdb/packaging/RHEL/setup/ctdb.sysconfig
+++ b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
@@ -1,15 +1,52 @@
-# Options to ctdbd
+# Options to ctdbd. This is read by /etc/init.d/ctdb
 
-# DBDIR=/var/ctdb
+# the NODES file must be specified or ctdb won't start
+# it should contain a list of IPs that ctdb will use
+# it must be exactly the same on all cluster nodes
+# defaults to /etc/ctdb/nodes
 # NODES=/etc/ctdb/nodes
+
+# the directory to put the local ctdb database files in
+# defaults to /var/ctdb
+# DBDIR=/var/ctdb
+
+# the script to run when ctdb needs to ask the OS for help,
+# such as when a IP address needs to be taken or released
+# defaults to /etc/ctdb/events
 # EVENT_SCRIPT=/etc/ctdb/events
+
+# the location of the local ctdb socket
+# defaults to /tmp/ctdb.socket
 # CTDB_SOCKET=/tmp/ctdb.socket
+
+# what transport to use. Only tcp is currently supported
+# defaults to tcp
 # TRANSPORT="tcp"
+
+# should ctdb do IP takeover? If it should, then specify a file
+# containing the list of public IP addresses that ctdb will manage
+# Note that these IPs must be different from those in $NODES above
+# there is no default
 # PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
+
+# when doing IP takeover you also must specify what network interface
+# to use for the public addresses
+# there is no default
 # PUBLIC_INTERFACE=eth0
+
+# where to log messages
+# the default is /var/log/log.ctdb
 # LOGFILE=/var/log/log.ctdb
+
+# what debug level to run at. Higher means more verbose
+# the default is 0
 # DEBUGLEVEL=0
 
-# any other options
+# use this to specify any local tcp ports to wait on before starting
+# ctdb. Use 445 and 139 for Samba
+# the default is not to wait for any local services
+# CTDB_WAIT_TCP_PORTS="445 139"
+
+# any other options you might want. Run ctdbd --help for a list
 # CTDB_OPTIONS=
 

diff --git a/ctdb/tools/events b/ctdb/tools/events
index 58aba9e319c85d78a86bb31757053690c80d1e7b..22b0742971859d46a8f80b01d25bf0a47ba7a30d 100755 (executable)
--- a/ctdb/tools/events
+++ b/ctdb/tools/events
@@ -11,6 +11,7 @@ case $cmd in
        # wait for local services to come up
        [ -z "$CTDB_WAIT_TCP_PORTS" ] || {
          all_ok=0
+         echo "Waiting for tcp services on $CTDB_WAIT_TCP_PORTS to come up"
          while [ $all_ok -eq 0 ]; do
                  all_ok=1
                  for p in $CTDB_WAIT_TCP_PORTS; do
@@ -18,7 +19,7 @@ case $cmd in
                  done
                  [ $all_ok -eq 1 ] || sleep 1
           done
-         echo "Local services on $CTDB_WAIT_TCP_PORTS are up"
+         echo "Local tcp services on $CTDB_WAIT_TCP_PORTS are up"
        }
        exit 0; 
        ;;