From 61efed5a7e19825d49130b4e6785cfb29c557a32 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 15 May 2018 18:47:29 +1000 Subject: [PATCH] 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 Reviewed-by: Amitay Isaacs --- ctdb/config/ctdbd_wrapper | 1 - ctdb/config/events.d/00.ctdb | 2 -- ctdb/doc/ctdbd.conf.5.xml | 10 ---------- 3 files changed, 13 deletions(-) diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper index e8f0a23a2575..1642009a69c9 100755 --- 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 272dcb1ba355..8d376d2a95b8 100755 --- 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 e02e86c7568e..6b56159aab7b 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -262,16 +262,6 @@ - - CTDB_MAX_PERSISTENT_CHECK_ERRORS=NUM - - - Default 0. Corresponds to - . - - - - CTDB_NODE_ADDRESS=IPADDR -- 2.34.1