From: Martin Schwenke Date: Sun, 10 Apr 2016 22:10:23 +0000 (+1000) Subject: ctdb-daemon: Drop --lvs option and support for CTDB_CAP_LVS X-Git-Tag: talloc-2.1.7~242 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffd64de7729cbe078d8dbc2546fe8ccb472b4bb7;p=thirdparty%2Fsamba.git ctdb-daemon: Drop --lvs option and support for CTDB_CAP_LVS Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Fri Apr 15 09:35:51 CEST 2016 on sn-devel-144 --- diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index 20dcba09e08..7cab96f52ff 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -800,7 +800,6 @@ pnn:3 10.0.0.14 OK RECMASTER: YES LMASTER: YES -LVS: NO diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml index cf792135cce..0f75f77a5df 100644 --- a/ctdb/doc/ctdbd.1.xml +++ b/ctdb/doc/ctdbd.1.xml @@ -228,19 +228,6 @@ - - --lvs - - - This option is used to activate the LVS capability on a CTDB - node. Please see the LVS section in - ctdb - 7 for more - information. - - - - --max-persistent-check-errors=NUM diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h index 9c112df6be7..e3ac7214bd6 100644 --- a/ctdb/protocol/protocol.h +++ b/ctdb/protocol/protocol.h @@ -711,8 +711,7 @@ struct ctdb_public_ip_list { */ #define CTDB_CAP_RECMASTER 0x00000001 #define CTDB_CAP_LMASTER 0x00000002 -/* This capability is set if CTDB_LVS_PUBLIC_IP is set */ -#define CTDB_CAP_LVS 0x00000004 +#define CTDB_CAP_LVS 0x00000004 /* obsolete */ #define CTDB_CAP_NATGW 0x00000008 /* obsolete */ /* diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 1565eae6059..6d8a7d4beca 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -59,7 +59,6 @@ static struct { int start_as_stopped; int no_lmaster; int no_recmaster; - int lvs; int script_log_level; int no_publicipcheck; int max_persistent_check_errors; @@ -138,7 +137,6 @@ int main(int argc, const char *argv[]) { "start-as-stopped", 0, POPT_ARG_NONE, &options.start_as_stopped, 0, "Node starts in stopped state", NULL }, { "no-lmaster", 0, POPT_ARG_NONE, &options.no_lmaster, 0, "disable lmaster role on this node", NULL }, { "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL }, - { "lvs", 0, POPT_ARG_NONE, &options.lvs, 0, "lvs is enabled on this node", NULL }, { "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, 0, "log level of event script output", NULL }, { "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "don't check we have/don't have the correct public ip addresses", NULL }, { "max-persistent-check-errors", 0, POPT_ARG_INT, @@ -236,9 +234,6 @@ int main(int argc, const char *argv[]) if (options.no_recmaster != 0) { ctdb->capabilities &= ~CTDB_CAP_RECMASTER; } - if (options.lvs != 0) { - ctdb->capabilities |= CTDB_CAP_LVS; - } /* Initialise this node's PNN to the unknown value. This will * be set to the correct value by either ctdb_add_node() as diff --git a/ctdb/tests/src/ctdb_test_stubs.c b/ctdb/tests/src/ctdb_test_stubs.c index 83ba3987d01..8ed2840d458 100644 --- a/ctdb/tests/src/ctdb_test_stubs.c +++ b/ctdb/tests/src/ctdb_test_stubs.c @@ -29,8 +29,7 @@ static struct ctdb_node_capabilities *global_caps = NULL; * By default, capablities for each node are * CTDB_CAP_RECMASTER|CTDB_CAP_LMASTER. These 2 * capabilities can be faked off by adding, for example, - * -CTDB_CAP_RECMASTER. LVS can be faked on by adding - * CTDB_CAP_LVS. + * -CTDB_CAP_RECMASTER. */ /* A fake flag that is only supported by some functions */ @@ -102,8 +101,6 @@ static void ctdb_test_stubs_read_nodemap(struct ctdb_context *ctdb) capabilities &= ~CTDB_CAP_RECMASTER; } else if (strcmp(tok, "-CTDB_CAP_LMASTER") == 0) { capabilities &= ~CTDB_CAP_LMASTER; - } else if (strcmp(tok, "CTDB_CAP_LVS") == 0) { - capabilities |= CTDB_CAP_LVS; } else if (strcmp(tok, "TIMEOUT") == 0) { /* This can be done with just a flag * value but it is probably clearer diff --git a/ctdb/tests/tool/stubby.getcapabilities.001.sh b/ctdb/tests/tool/stubby.getcapabilities.001.sh index e89f7a015f8..e924d5ad2fb 100755 --- a/ctdb/tests/tool/stubby.getcapabilities.001.sh +++ b/ctdb/tests/tool/stubby.getcapabilities.001.sh @@ -7,7 +7,6 @@ define_test "3 nodes, all ok" required_result 0 <