ctdb-config: Integrate failover options into conf-tool

Update and add tests accordingly.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589

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 329b20476c11eda2e998307212c620eb2a16c399..e6020c504e62e0a835fc76902338f9a3f7ba7843 100644 (file)
--- 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 "failover/failover_conf.h"
 #include "server/legacy_conf.h"
 
 #include "common/conf_tool.h"
@@ -243,6 +244,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);
+       failover_conf_init(ctx->conf);
        legacy_conf_init(ctx->conf);
 
        if (! conf_valid(ctx->conf)) {

diff --git a/ctdb/tests/cunit/config_test_001.sh b/ctdb/tests/cunit/config_test_001.sh
index 74686cac9b9ad7751edd5358cde48a09fe4831a8..c0a6e89aeb246ceec7c4f945f87e463fc47743b1 100755 (executable)
--- a/ctdb/tests/cunit/config_test_001.sh
+++ b/ctdb/tests/cunit/config_test_001.sh
@@ -43,6 +43,8 @@ ok <<EOF
        # tdb mutexes = true
 [event]
        # debug script = 
+[failover]
+       # disabled = false
 [legacy]
        # realtime scheduling = true
        # recmaster capability = true

diff --git a/ctdb/tests/cunit/config_test_007.sh b/ctdb/tests/cunit/config_test_007.sh
new file mode 100755 (executable)
index 0000000..adffeb7
--- /dev/null
+++ b/ctdb/tests/cunit/config_test_007.sh
@@ -0,0 +1,24 @@
+#!/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 "failover" "disabled"

diff --git a/ctdb/wscript b/ctdb/wscript
index ab513ec57f55056c8d096720ca765ae2af04fbf1..1d7a31b39fa4df1d948cc6bb90fff83092334974 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -511,6 +511,7 @@ def build(bld):
                              ctdb-event-conf
                              ctdb-cluster-conf
                              ctdb-database-conf
+                             ctdb-failover-conf
                              ctdb-legacy-conf
                              ctdb-util samba-util talloc replace popt''',
                      install_path='${CTDB_HELPER_BINDIR}')