[Pkg-samba-maint] r1869 - trunk/ctdb/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-12 21:14:25 +0000 (Mon, 12 May 2008)
New Revision: 1869

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
  * New upstream git snapshot
  * From 1.0.35: Add ability to disable recmaster and lmaster roles through
    sysconfig file and command line arguments
  * From 1.0.38: Use tdbdump to verify that all persistent database files are
    good before we start the daemon.


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-05-12 05:36:02 UTC (rev 1868)
+++ trunk/ctdb/debian/changelog	2008-05-12 21:14:25 UTC (rev 1869)
@@ -1,3 +1,13 @@
+ctdb (1.0.37+git200805121644-1) UNRELEASED; urgency=low
+
+  * New upstream git snapshot
+  * From 1.0.35: Add ability to disable recmaster and lmaster roles through
+    sysconfig file and command line arguments
+  * From 1.0.38: Use tdbdump to verify that all persistent database files are
+    good before we start the daemon.
+
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 12 May 2008 23:11:07 +0200
+
 ctdb (1.0.34+git200804242206-1) unstable; urgency=low
 
   * New upstream git snapshot
@@ -4,7 +14,7 @@
   * added CTDB_START_AS_DISABLED parameter to ctdb.init
   * removed 03_web.diff, replaced by sed replaces in debian/rules 
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 26 Apr 2008 15:21:27 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 12 May 2008 22:58:07 +0200
 
 ctdb (1.0.31+git200803251111-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2008-05-12 05:36:02 UTC (rev 1868)
+++ trunk/ctdb/debian/ctdb.init	2008-05-12 21:14:25 UTC (rev 1869)
@@ -82,6 +82,13 @@
 [ -z "$CTDB_START_AS_DISABLED" ] || [ "$CTDB_START_AS_DISABLED" != "yes" ] || {
         CTDB_OPTIONS="$CTDB_OPTIONS --start-as-disabled"
 }
+[ -z "$CTDB_CAPABILITY_RECMASTER" ] || [ "$CTDB_CAPABILITY_RECMASTER" != "no" ] || {
+	CTDB_OPTIONS="$CTDB_OPTIONS --no-recmaster"
+}
+[ -z "$CTDB_CAPABILITY_LMASTER" ] || [ "$CTDB_CAPABILITY_LMASTER" != "no" ] || {
+	CTDB_OPTIONS="$CTDB_OPTIONS --no-lmaster"
+}
+
 # Check that the user exists (if we set a user)
 # Does the user exist?
 if [ -n "$DAEMONUSER" ] ; then
@@ -104,7 +111,18 @@
 }
 
 start_server() {
-# Start the process using the wrapper
+        # check all persistent databases that they look ok
+        PERSISTENT_DB_DIR="/var/lib/ctdb/persistent"
+        [ -z "$CTDB_DBDIR" ] || {
+                PERSISTENT_DB_DIR="$CTDB_DBDIR/persistent"
+        }
+        for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9]`; do
+                /usr/bin/tdbdump $PDBASE >/dev/null 2>/dev/null || {
+                        echo "Persistent database $PDBASE is corrupted! CTDB will not start."
+                        return 1
+                }
+        done
+        # Start the process using the wrapper
         if [ -z "$DAEMONUSER" ] ; then
             start-stop-daemon --start --quiet --background \
                         --exec $DAEMON -- $CTDB_OPTIONS