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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-12-18 10:37:07 +0000 (Fri, 18 Dec 2009)
New Revision: 3171

Modified:
   trunk/ctdb/debian/ctdb.init
Log:
Cheery picked fc5f556d488488040303438aefecb5ae2a8e54bc

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-12-18 10:36:10 UTC (rev 3170)
+++ trunk/ctdb/debian/ctdb.init	2009-12-18 10:37:07 UTC (rev 3171)
@@ -173,6 +173,7 @@
     maybe_set "--lvs --single-public-ip" "$CTDB_LVS_PUBLIC_IP"
     maybe_set "--script-log-level"       "$CTDB_SCRIPT_LOG_LEVEL"
     maybe_set "--syslog"                 "$CTDB_SYSLOG"               "yes"
+    maybe_set "--max-persistent-check-errors" "$CTDB_MAX_PERSISTENT_CHECK_ERRORS"
 }
 
 check_tdb () {
@@ -205,6 +206,14 @@
         *) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/ctdb}/persistent" ;;
     esac
     mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
+    local ERRCOUNT=$CTDB_MAX_PERSISTENT_CHECK_ERRORS
+
+    test -z "$ERRCOUNT" && {
+	ERRCOUNT="0"
+    }
+    test x"$ERRCOUNT" != x"0" && {
+	return 0;
+    }
     for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2>/dev/null`; do
         check_tdb $PDBASE || {
         echo "Persistent database $PDBASE is corrupted! CTDB will not start."