ctdb-scripts: Drop CTDB_MAX_PERSISTENT_CHECK_ERRORS option

This must harken back to the days of yore when corrupt persistent
databases were an issue.  We haven't seen this used.  If CTDB fails to
start due to a corrupt persistent database then this database can be
removed by hand.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index e8f0a23a2575a4027a4189a3a3cce6b9c283ae3b..1642009a69c9f18bb77b8bcc75460baa557ebc55 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -69,7 +69,6 @@ build_ctdb_options ()
     maybe_set "--no-lmaster"             "$CTDB_CAPABILITY_LMASTER"   "no"
     maybe_set "--nosetsched"             "$CTDB_NOSETSCHED"           "yes"
     maybe_set "--script-log-level"       "$CTDB_SCRIPT_LOG_LEVEL"
-    maybe_set "--max-persistent-check-errors" "$CTDB_MAX_PERSISTENT_CHECK_ERRORS"
 }
 
 export_debug_variables ()

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 272dcb1ba355392422b78b718c5a4bd6e189b9c1..8d376d2a95b84b7afaa57eafae743adac36019d7 100755 (executable)
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -68,8 +68,6 @@ check_persistent_databases ()
     _dir="${CTDB_DBDIR_PERSISTENT:-${CTDB_VARDIR}/persistent}"
     [ -d "$_dir" ] || return 0
 
-    [ "${CTDB_MAX_PERSISTENT_CHECK_ERRORS:-0}" = "0" ] || return 0
-
     for _db in "$_dir/"*.tdb.*[0-9] ; do
        [ -r "$_db" ] || continue
        check_tdb "$_db" || \

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index e02e86c7568e80476e3b93d55ef076f1d5f58e70..6b56159aab7b95aa8c358c6d4937d37b1f2444da 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -262,16 +262,6 @@
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-       <term>CTDB_MAX_PERSISTENT_CHECK_ERRORS=<parameter>NUM</parameter></term>
-       <listitem>
-         <para>
-           Default 0.  Corresponds to
-           <option>--max-persistent-check-errors</option>.
-         </para>
-       </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term>CTDB_NODE_ADDRESS=<parameter>IPADDR</parameter></term>
        <listitem>