From cf17a48d29a991b7dc7d582e538f11b5a0ac8166 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 20 Apr 2018 17:11:59 +1000 Subject: [PATCH] ctdb-cluster: Define cluster configuration file options Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/cluster/cluster_conf.c | 124 ++++++++++++++++++++++++++++++++++++ ctdb/cluster/cluster_conf.h | 33 ++++++++++ ctdb/wscript | 4 ++ 3 files changed, 161 insertions(+) create mode 100644 ctdb/cluster/cluster_conf.c create mode 100644 ctdb/cluster/cluster_conf.h diff --git a/ctdb/cluster/cluster_conf.c b/ctdb/cluster/cluster_conf.c new file mode 100644 index 000000000000..540732d5b919 --- /dev/null +++ b/ctdb/cluster/cluster_conf.c @@ -0,0 +1,124 @@ +/* + CTDB cluster 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 "system/network.h" + +#include "lib/util/debug.h" + +#include "common/conf.h" + +#include "cluster_conf.h" + +#define CLUSTER_TRANSPORT_DEFAULT "tcp" + +/* + * Ideally this wants to be a void function but it also used directly + * as a validation function + */ +static bool check_static_string_change(const char *key, + const char *old_value, + const char *new_value, + enum conf_update_mode mode) +{ + if (mode == CONF_MODE_RELOAD) { + if (strcmp(old_value, new_value) != 0) { + D_WARNING("Ignoring update of [%s] -> %s\n", + CLUSTER_CONF_SECTION, + key); + } + } + + return true; +} + +static bool validate_transport(const char *key, + const char *old_transport, + const char *new_transport, + enum conf_update_mode mode) +{ + /* Don't allow "ib" for now. It is broken! */ + if (strcmp(new_transport, CLUSTER_TRANSPORT_DEFAULT) != 0) { + D_ERR("Invalid value for [cluster] -> transport = %s\n", + new_transport); + return false; + } + + /* This sometimes warns but always returns true */ + return check_static_string_change(key, + old_transport, + new_transport, + mode); +} + +static bool validate_node_address(const char *key, + const char *old_node_address, + const char *new_node_address, + enum conf_update_mode mode) +{ + struct in_addr addr4; + struct in6_addr addr6; + int ret; + + if (new_node_address == NULL) { + goto good; + } + + ret = inet_pton(AF_INET, new_node_address, &addr4); + if (ret == 1) { + goto good; + } + + ret = inet_pton(AF_INET6, new_node_address, &addr6); + if (ret == 1) { + goto good; + } + + D_ERR("Invalid value for [cluster] -> node address = %s\n", + new_node_address); + return false; + +good: + /* This sometimes warns but always returns true */ + return check_static_string_change(key, + old_node_address, + new_node_address, + mode); +} + +void cluster_conf_init(struct conf_context *conf) +{ + conf_define_section(conf, CLUSTER_CONF_SECTION, NULL); + + conf_define_string(conf, + CLUSTER_CONF_SECTION, + CLUSTER_CONF_TRANSPORT, + CLUSTER_TRANSPORT_DEFAULT, + validate_transport); + conf_define_string(conf, + CLUSTER_CONF_SECTION, + CLUSTER_CONF_NODE_ADDRESS, + NULL, + validate_node_address); + conf_define_string(conf, + CLUSTER_CONF_SECTION, + CLUSTER_CONF_RECOVERY_LOCK, + NULL, + check_static_string_change); +} diff --git a/ctdb/cluster/cluster_conf.h b/ctdb/cluster/cluster_conf.h new file mode 100644 index 000000000000..6b797ef1085c --- /dev/null +++ b/ctdb/cluster/cluster_conf.h @@ -0,0 +1,33 @@ +/* + CTDB cluster 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_CLUSTER_CONF_H__ +#define __CTDB_CLUSTER_CONF_H__ + +#include "common/conf.h" + +#define CLUSTER_CONF_SECTION "cluster" + +#define CLUSTER_CONF_TRANSPORT "transport" +#define CLUSTER_CONF_NODE_ADDRESS "node address" +#define CLUSTER_CONF_RECOVERY_LOCK "recovery lock" + +void cluster_conf_init(struct conf_context *conf); + +#endif /* __CTDB_CLUSTER_CONF_H__ */ diff --git a/ctdb/wscript b/ctdb/wscript index 430926c3924b..184fc549ba1a 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -464,6 +464,10 @@ def build(bld): deps='''ctdb-util samba-util talloc replace popt''', install_path='${CTDB_HELPER_BINDIR}') + bld.SAMBA_SUBSYSTEM('ctdb-cluster-conf', + source='cluster/cluster_conf.c', + deps='ctdb-util') + bld.SAMBA_SUBSYSTEM('ctdb-event-conf', source='event/event_conf.c', deps='ctdb-util') -- 2.34.1