Rev 398: - nice messages while waiting for tcp services to come up in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 398
revision-id: tridge at samba.org-20070530023703-lziyfdmz2n34w03i
parent: tridge at samba.org-20070530022758-26c4o6952lel86gt
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Wed 2007-05-30 12:37:03 +1000
message:
  - nice messages while waiting for tcp services to come up
  - added more comments to sysconfig file
modified:
  packaging/RHEL/setup/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
  tools/events                   events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig	2007-05-29 06:02:02 +0000
+++ b/packaging/RHEL/setup/ctdb.sysconfig	2007-05-30 02:37:03 +0000
@@ -1,15 +1,52 @@
-# Options to ctdbd
-
+# Options to ctdbd. This is read by /etc/init.d/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
-# NODES=/etc/ctdb/nodes
+
+# 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=
 

=== modified file 'tools/events'
--- a/tools/events	2007-05-30 02:27:58 +0000
+++ b/tools/events	2007-05-30 02:37:03 +0000
@@ -11,6 +11,7 @@
 	# 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 @@
 		  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;	
 	;;