From: Martin Schwenke Date: Tue, 15 May 2018 08:51:29 +0000 (+1000) Subject: ctdb-daemon: Drop ctdbd --max-persistent-check-errors option X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=920f83457861c5f0566e9fb664efe7c715dee09a ctdb-daemon: Drop ctdbd --max-persistent-check-errors option Leave the code with an internal default of 0. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index fa2583ccd02e..83c47329710b 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -55,7 +55,6 @@ static struct { int no_lmaster; int no_recmaster; int script_log_level; - int max_persistent_check_errors; } options = { .debuglevel = "NOTICE", .transport = "tcp", @@ -187,9 +186,6 @@ int main(int argc, const char *argv[]) { "no-lmaster", 0, POPT_ARG_NONE, &options.no_lmaster, 0, "disable lmaster role on this node", NULL }, { "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL }, { "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, 0, "log level of event script output", NULL }, - { "max-persistent-check-errors", 0, POPT_ARG_INT, - &options.max_persistent_check_errors, 0, - "max allowed persistent check errors (default 0)", NULL }, POPT_TABLEEND }; int opt, ret; @@ -321,13 +317,6 @@ int main(int argc, const char *argv[]) ctdb->db_directory_persistent = options.db_dir_persistent; ctdb->db_directory_state = options.db_dir_state; - if (options.max_persistent_check_errors < 0) { - ctdb->max_persistent_check_errors = 0xFFFFFFFFFFFFFFFFLL; - } else { - ctdb->max_persistent_check_errors = - (uint64_t)options.max_persistent_check_errors; - } - /* * Legacy setup/options */