ctdb-daemon: Mark NoIPHostOnAllDisabled tunable as obsolete
authorMartin Schwenke <martin@meltin.net>
Mon, 18 Jun 2018 06:05:44 +0000 (16:05 +1000)
committerAmitay Isaacs <amitay@samba.org>
Wed, 11 Jul 2018 09:48:38 +0000 (11:48 +0200)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/common/tunable.c
ctdb/doc/ctdb-tunables.7.xml
ctdb/doc/ctdb.1.xml
ctdb/server/ctdb_takeover_helper.c
ctdb/tests/tool/ctdb.listvars.001.sh

index 0b6f026..4c1714c 100644 (file)
@@ -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) },
index 75a3b01..a925ca5 100644 (file)
@@ -442,29 +442,15 @@ MonitorInterval=20
       </para>
     </refsect2>
 
-    <refsect2>
-      <title>NoIPHostOnAllDisabled</title>
-      <para>Default: 0</para>
-      <para>
-       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.
-      </para>
-    </refsect2>
-
     <refsect2>
       <title>NoIPTakeover</title>
       <para>Default: 0</para>
       <para>
        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.
       </para>
     </refsect2>
 
index 075add2..90e532c 100644 (file)
@@ -827,7 +827,6 @@ DBRecordCountWarn       = 100000
 DBRecordSizeWarn        = 10000000
 DBSizeWarn              = 100000000
 PullDBPreallocation     = 10485760
-NoIPHostOnAllDisabled   = 0
 TDBMutexEnabled         = 1
 LockProcessesPerDB      = 200
 RecBufferSizeLimit      = 1000000
index 9461e71..2068702 100644 (file)
@@ -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).
index ca014dc..e9fb686 100755 (executable)
@@ -58,7 +58,6 @@ DBRecordCountWarn          = 100000
 DBRecordSizeWarn           = 10000000
 DBSizeWarn                 = 100000000
 PullDBPreallocation        = 10485760
-NoIPHostOnAllDisabled      = 1
 TDBMutexEnabled            = 1
 LockProcessesPerDB         = 200
 RecBufferSizeLimit         = 1000000