diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-08-21 13:41:22 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-08-24 10:59:21 +0200 |
| commit | 929634126a334e380f16c080b59d062873b4e5f9 (patch) | |
| tree | 8d84ce9faafa242ad1677bb5886aa9568f31a1b0 /ctdb/doc | |
| parent | d003a41a9cb9ea97a7da9dbb5bd3138f82da6cf1 (diff) | |
| download | samba-929634126a334e380f16c080b59d062873b4e5f9.tar.gz | |
ctdb-config: Switch tunable DisableIPFailover to a config option
Use the "failover:disabled" option instead.
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>
Diffstat (limited to 'ctdb/doc')
| -rw-r--r-- | ctdb/doc/ctdb-tunables.7.xml | 17 | ||||
| -rw-r--r-- | ctdb/doc/ctdb.1.xml | 1 | ||||
| -rw-r--r-- | ctdb/doc/ctdb.conf.5.xml | 29 |
3 files changed, 29 insertions, 18 deletions
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml index db3dd209760..71cb0e31142 100644 --- a/ctdb/doc/ctdb-tunables.7.xml +++ b/ctdb/doc/ctdb-tunables.7.xml @@ -178,23 +178,6 @@ MonitorInterval=20 </refsect2> <refsect2> - <title>DisableIPFailover</title> - <para>Default: 0</para> - <para> - When set to non-zero, ctdb will not perform failover or - failback. Even if a node fails while holding public IPs, ctdb - will not recover the IPs or assign them to another node. - </para> - <para> - When this tunable is enabled, ctdb will no longer attempt - to recover the cluster by failing IP addresses over to other - nodes. This leads to a service outage until the administrator - has manually performed IP failover to replacement nodes using the - 'ctdb moveip' command. - </para> - </refsect2> - - <refsect2> <title>ElectionTimeout</title> <para>Default: 3</para> <para> diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index da699ff89f0..355547af41e 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -800,7 +800,6 @@ DatabaseMaxDead = 5 RerecoveryTimeout = 10 EnableBans = 1 NoIPFailback = 0 -DisableIPFailover = 0 VerboseMemoryNames = 0 RecdPingTimeout = 60 RecdFailCount = 10 diff --git a/ctdb/doc/ctdb.conf.5.xml b/ctdb/doc/ctdb.conf.5.xml index 316ac7f469d..01c09bf53be 100644 --- a/ctdb/doc/ctdb.conf.5.xml +++ b/ctdb/doc/ctdb.conf.5.xml @@ -393,6 +393,35 @@ <refsect1> <title> + FAILOVER CONFIGURATION + </title> + + <para> + Options in this section affect CTDB failover. They are + valid within the <emphasis>failover</emphasis> section of file, + indicated by <literal>[failover]</literal>. + </para> + + <variablelist> + + <varlistentry> + <term>disabled = true|false</term> + <listitem> + <para> + If set to <literal>true</literal> then public IP failover + is disabled. + </para> + <para> + Default: <literal>false</literal> + </para> + </listitem> + </varlistentry> + + </variablelist> + </refsect1> + + <refsect1> + <title> LEGACY CONFIGURATION </title> |