ctdb-daemon: Define ctdbd legacy configuration file options
authorMartin Schwenke <martin@meltin.net>
Wed, 11 Apr 2018 10:36:45 +0000 (20:36 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 17 May 2018 02:04:31 +0000 (04:04 +0200)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/legacy_conf.c [new file with mode: 0644]
ctdb/server/legacy_conf.h [new file with mode: 0644]
ctdb/wscript

diff --git a/ctdb/server/legacy_conf.c b/ctdb/server/legacy_conf.c
new file mode 100644 (file)
index 0000000..c435dae
--- /dev/null
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+
+#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 (file)
index 0000000..6592b17
--- /dev/null
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+
+#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__ */
index 1e9b32aa2a33d0590fa75a662d73a7384e7d12fb..e29c075e8cca1c9559d8fe21d1c644a24d5e7d1b 100644 (file)
@@ -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',