From: Martin Schwenke <martin@meltin.net>
Date: Fri, 11 May 2018 12:49:46 +0000 (+1000)
Subject: ctdb-tools: Add legacy config options to config tool
X-Git-Tag: ldb-1.4.0~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b42dbadbef1f57e5c59edb1ee094434243c892ba;p=thirdparty%2Fsamba.git

ctdb-tools: Add legacy config options to config tool

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/common/conf_tool.c b/ctdb/common/conf_tool.c
index 5a8800b049e..329b20476c1 100644
--- a/ctdb/common/conf_tool.c
+++ b/ctdb/common/conf_tool.c
@@ -32,6 +32,7 @@
 #include "cluster/cluster_conf.h"
 #include "database/database_conf.h"
 #include "event/event_conf.h"
+#include "server/legacy_conf.h"
 
 #include "common/conf_tool.h"
 
@@ -242,6 +243,7 @@ int conf_tool_run(struct conf_tool_context *ctx, int *result)
 	cluster_conf_init(ctx->conf);
 	database_conf_init(ctx->conf);
 	event_conf_init(ctx->conf);
+	legacy_conf_init(ctx->conf);
 
 	if (! conf_valid(ctx->conf)) {
 		D_ERR("Failed to define configuration options\n");
diff --git a/ctdb/tests/cunit/config_test_001.sh b/ctdb/tests/cunit/config_test_001.sh
index 3627122baeb..a3ddaabc09b 100755
--- a/ctdb/tests/cunit/config_test_001.sh
+++ b/ctdb/tests/cunit/config_test_001.sh
@@ -42,6 +42,13 @@ ok <<EOF
 	# lock debug script = 
 [event]
 	# debug script = 
+[legacy]
+	# no realtime = false
+	# recmaster capability = true
+	# lmaster capability = true
+	# start as stopped = false
+	# start as disabled = false
+	# script log level = ERROR
 EOF
 unit_test ctdb-config dump
 
diff --git a/ctdb/tests/cunit/config_test_006.sh b/ctdb/tests/cunit/config_test_006.sh
new file mode 100755
index 00000000000..bfbd917221c
--- /dev/null
+++ b/ctdb/tests/cunit/config_test_006.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+PATH="$PATH:$CTDB_SCRIPTS_HELPER_BINDIR"
+
+setup_ctdb_base "${TEST_VAR_DIR}" "cunit"
+
+conffile="${CTDB_BASE}/ctdb.conf"
+
+remove_files ()
+{
+	rm -f "$conffile"
+}
+
+test_cleanup remove_files
+
+cat > "$conffile" <<EOF
+EOF
+
+ok <<EOF
+false
+EOF
+unit_test ctdb-config get "legacy" "no realtime"
+
+ok <<EOF
+true
+EOF
+unit_test ctdb-config get "legacy" "recmaster capability"
+
+ok <<EOF
+true
+EOF
+unit_test ctdb-config get "legacy" "lmaster capability"
+
+ok <<EOF
+false
+EOF
+unit_test ctdb-config get "legacy" "start as stopped"
+
+ok <<EOF
+false
+EOF
+unit_test ctdb-config get "legacy" "start as disabled"
+
+ok <<EOF
+ERROR
+EOF
+unit_test ctdb-config get "legacy" "script log level"
+
+cat > "$conffile" <<EOF
+[legacy]
+	script log level = INVALID
+EOF
+
+required_result 22 <<EOF
+Invalid value for [legacy] -> script log level = INVALID
+conf: validation for option "script log level" failed
+Failed to load config file ${conffile}
+EOF
+unit_test ctdb-config validate
diff --git a/ctdb/wscript b/ctdb/wscript
index e29c075e8cc..7661cba5d20 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -487,6 +487,7 @@ def build(bld):
                              ctdb-event-conf
                              ctdb-cluster-conf
                              ctdb-database-conf
+                             ctdb-legacy-conf
                              ctdb-util samba-util talloc replace popt''',
                      install_path='${CTDB_HELPER_BINDIR}')