From: Martin Schwenke Date: Mon, 18 Jun 2018 06:05:44 +0000 (+1000) Subject: ctdb-daemon: Mark NoIPHostOnAllDisabled tunable as obsolete X-Git-Tag: tevent-0.9.37~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070469beb812501dd44847b7facc9dfab436616c;p=thirdparty%2Fsamba.git ctdb-daemon: Mark NoIPHostOnAllDisabled tunable as obsolete Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/common/tunable.c b/ctdb/common/tunable.c index 0b6f0266c72..4c1714cee2d 100644 --- a/ctdb/common/tunable.c +++ b/ctdb/common/tunable.c @@ -141,7 +141,7 @@ static struct { offsetof(struct ctdb_tunable_list, db_size_warn) }, { "PullDBPreallocation", 10*1024*1024, false, offsetof(struct ctdb_tunable_list, pulldb_preallocation_size) }, - { "NoIPHostOnAllDisabled", 1, false, + { "NoIPHostOnAllDisabled", 1, true, offsetof(struct ctdb_tunable_list, no_ip_host_on_all_disabled) }, { "Samba3AvoidDeadlocks", 0, true, offsetof(struct ctdb_tunable_list, samba3_hack) }, diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml index 75a3b01c14d..a925ca5ab1f 100644 --- a/ctdb/doc/ctdb-tunables.7.xml +++ b/ctdb/doc/ctdb-tunables.7.xml @@ -442,29 +442,15 @@ MonitorInterval=20 - - NoIPHostOnAllDisabled - Default: 0 - - If no nodes are HEALTHY then by default ctdb will happily host - public IPs on disabled (unhealthy or administratively disabled) - nodes. This can cause problems, for example if the underlying - cluster filesystem is not mounted. When set to 1 and a node - is disabled, any IPs hosted by this node will be released and - the node will not takeover any IPs until it is no longer disabled. - - - NoIPTakeover Default: 0 When set to 1, ctdb will not allow IP addresses to be failed over to other nodes. Any IP addresses already hosted on - healthy nodes will remain. Usually IP addresses hosted on - unhealthy nodes will also remain, if NoIPHostOnAllDisabled is - 0. However, if NoIPHostOnAllDisabled is 1 then IP addresses - will be released by unhealthy nodes and will become un-hosted. + healthy nodes will remain. Any IP addresses hosted on + unhealthy nodes will be released by unhealthy nodes and will + become un-hosted. diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index 075add25880..90e532cb689 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -827,7 +827,6 @@ DBRecordCountWarn = 100000 DBRecordSizeWarn = 10000000 DBSizeWarn = 100000000 PullDBPreallocation = 10485760 -NoIPHostOnAllDisabled = 0 TDBMutexEnabled = 1 LockProcessesPerDB = 200 RecBufferSizeLimit = 1000000 diff --git a/ctdb/server/ctdb_takeover_helper.c b/ctdb/server/ctdb_takeover_helper.c index 9461e7149f0..20687024a40 100644 --- a/ctdb/server/ctdb_takeover_helper.c +++ b/ctdb/server/ctdb_takeover_helper.c @@ -672,7 +672,7 @@ static bool ipreallocated_recv(struct tevent_req *req, int *perr) * - Get nodemap * - Initialise IP allocation state. Pass: * + algorithm to be used; - * + various tunables (NoIPTakeover, NoIPFailback, NoIPHostOnAllDisabled) + * + various tunables (NoIPTakeover, NoIPFailback) * + list of nodes to force rebalance (internal structure, currently * no way to fetch, only used by LCP2 for nodes that have had new * IP addresses added). diff --git a/ctdb/tests/tool/ctdb.listvars.001.sh b/ctdb/tests/tool/ctdb.listvars.001.sh index ca014dcf9c3..e9fb686e191 100755 --- a/ctdb/tests/tool/ctdb.listvars.001.sh +++ b/ctdb/tests/tool/ctdb.listvars.001.sh @@ -58,7 +58,6 @@ DBRecordCountWarn = 100000 DBRecordSizeWarn = 10000000 DBSizeWarn = 100000000 PullDBPreallocation = 10485760 -NoIPHostOnAllDisabled = 1 TDBMutexEnabled = 1 LockProcessesPerDB = 200 RecBufferSizeLimit = 1000000