From d91b9b309ca270dbd60798902fcb45d2e3bb461a Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 11 Apr 2018 20:36:45 +1000 Subject: [PATCH] ctdb-daemon: Define ctdbd legacy configuration file options Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/legacy_conf.c | 85 +++++++++++++++++++++++++++++++++++++++ ctdb/server/legacy_conf.h | 36 +++++++++++++++++ ctdb/wscript | 4 ++ 3 files changed, 125 insertions(+) create mode 100644 ctdb/server/legacy_conf.c create mode 100644 ctdb/server/legacy_conf.h diff --git a/ctdb/server/legacy_conf.c b/ctdb/server/legacy_conf.c new file mode 100644 index 000000000000..c435dae3dfb1 --- /dev/null +++ b/ctdb/server/legacy_conf.c @@ -0,0 +1,85 @@ +/* + CTDB legacy config handling + + Copyright (C) Martin Schwenke 2018 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#include "replace.h" + +#include "lib/util/debug.h" + +#include "common/conf.h" +#include "common/logging.h" + +#include "legacy_conf.h" + +#define LEGACY_SCRIPT_LOG_LEVEL_DEFAULT "ERROR" + +static bool legacy_conf_validate_script_log_level(const char *key, + const char *old_loglevel, + const char *new_loglevel, + enum conf_update_mode mode) +{ + int log_level; + bool ok; + + ok = debug_level_parse(new_loglevel, &log_level); + if (!ok) { + D_ERR("Invalid value for [%s] -> %s = %s\n", + LEGACY_CONF_SECTION, + key, + new_loglevel); + return false; + } + + return true; +} + +void legacy_conf_init(struct conf_context *conf) +{ + conf_define_section(conf, LEGACY_CONF_SECTION, NULL); + + conf_define_boolean(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_NO_REALTIME, + false, + NULL); + conf_define_boolean(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_RECMASTER_CAPABILITY, + true, + NULL); + conf_define_boolean(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_LMASTER_CAPABILITY, + true, + NULL); + conf_define_boolean(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_START_AS_STOPPED, + false, + NULL); + conf_define_boolean(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_START_AS_DISABLED, + false, + NULL); + conf_define_string(conf, + LEGACY_CONF_SECTION, + LEGACY_CONF_SCRIPT_LOG_LEVEL, + LEGACY_SCRIPT_LOG_LEVEL_DEFAULT, + legacy_conf_validate_script_log_level); +} diff --git a/ctdb/server/legacy_conf.h b/ctdb/server/legacy_conf.h new file mode 100644 index 000000000000..6592b176df2f --- /dev/null +++ b/ctdb/server/legacy_conf.h @@ -0,0 +1,36 @@ +/* + CTDB legacy config handling + + Copyright (C) Martin Schwenke 2018 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see . +*/ + +#ifndef __CTDB_LEGACY_CONF_H__ +#define __CTDB_LEGACY_CONF_H__ + +#include "common/conf.h" + +#define LEGACY_CONF_SECTION "legacy" + +#define LEGACY_CONF_NO_REALTIME "no realtime" +#define LEGACY_CONF_RECMASTER_CAPABILITY "recmaster capability" +#define LEGACY_CONF_LMASTER_CAPABILITY "lmaster capability" +#define LEGACY_CONF_START_AS_STOPPED "start as stopped" +#define LEGACY_CONF_START_AS_DISABLED "start as disabled" +#define LEGACY_CONF_SCRIPT_LOG_LEVEL "script log level" + +void legacy_conf_init(struct conf_context *conf); + +#endif /* __CTDB_LEGACY_CONF_H__ */ diff --git a/ctdb/wscript b/ctdb/wscript index 1e9b32aa2a33..e29c075e8cca 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -476,6 +476,10 @@ def build(bld): source='event/event_conf.c', deps='ctdb-util') + bld.SAMBA_SUBSYSTEM('ctdb-legacy-conf', + source='server/legacy_conf.c', + deps='ctdb-util') + bld.SAMBA_BINARY('ctdb-config', source='common/conf_tool.c', cflags='-DCTDB_CONF_TOOL', -- 2.34.1