From: Martin Schwenke <martin@meltin.net>
Date: Thu, 5 Apr 2018 00:54:00 +0000 (+1000)
Subject: ctdb-scripts: Don't check for CTDB_PARTIALLY_ONLINE_INTERFACES clash
X-Git-Tag: ldb-1.4.0~287
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=130f37c23f9570c4cf2d87a4bc5502569dab1179;p=thirdparty%2Fsamba.git

ctdb-scripts: Don't check for CTDB_PARTIALLY_ONLINE_INTERFACES clash

Just document that NAT gateway and LVS are not compatible with this
option.  Update the documentation to make it clear that this is a
10.interface option.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index cf80d41c41e..18b064a1efb 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -47,10 +47,6 @@ natgw_check_config ()
     [ -n "$CTDB_NATGW_PRIVATE_NETWORK" ] || \
 	    die "Invalid configuration: CTDB_NATGW_PRIVATE_NETWORK not set"
 
-    if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
-	    die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with NAT gateway"
-    fi
-
     # The default is to create a single default route
     [ -n "$CTDB_NATGW_STATIC_ROUTES" ] || CTDB_NATGW_STATIC_ROUTES="0.0.0.0/0"
 }
diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs
index c70f0c13158..b3d65f44607 100755
--- a/ctdb/config/events.d/91.lvs
+++ b/ctdb/config/events.d/91.lvs
@@ -37,10 +37,6 @@ lvs_check_config ()
 		[ -n "$CTDB_LVS_PUBLIC_IFACE" ] || \
 			die "Invalid configuration: CTDB_LVS_PUBLIC_IFACE not set"
 	fi
-
-	if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
-		die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with LVS"
-	fi
 }
 
 case "$1" in
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index dc530749b2c..2f230756a24 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -480,6 +480,51 @@
   <refsect1>
     <title>NETWORK CONFIGURATION</title>
 
+    <refsect2>
+      <title>PUBLIC IP ADDRESS FAILOVER</title>
+
+      <refsect3>
+	<title>Eventscripts</title>
+
+	<simplelist>
+	  <member><filename>10.interface</filename></member>
+	</simplelist>
+      </refsect3>
+
+      <variablelist>
+
+	<varlistentry>
+	  <term>
+	    CTDB_PARTIALLY_ONLINE_INTERFACES=yes|no
+	  </term>
+	  <listitem>
+	    <para>
+	      Whether one or more offline interfaces should cause a
+	      monitor event to fail if there are other interfaces that
+	      are up.  If this is "yes" and a node has some interfaces
+	      that are down then <command>ctdb status</command> will
+	      display the node as "PARTIALLYONLINE".
+	    </para>
+
+	    <para>
+	      Note that CTDB_PARTIALLY_ONLINE_INTERFACES=yes is not
+	      generally compatible with NAT gateway or LVS.  NAT
+	      gateway relies on the interface configured by
+	      CTDB_NATGW_PUBLIC_IFACE to be up and LVS replies on
+	      CTDB_LVS_PUBLIC_IFACE to be up.  CTDB does not check if
+	      these options are set in an incompatible way so care is
+	      needed to understand the interaction.
+	    </para>
+
+	    <para>
+	      Default is "no".
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+      </variablelist>
+    </refsect2>
+
     <refsect2>
       <title>NAT GATEWAY</title>
 
@@ -855,38 +900,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
       </variablelist>
     </refsect2>
 
-    <refsect2>
-      <title>MISCELLANEOUS NETWORK CONFIGURATION</title>
-
-      <variablelist>
-
-	<varlistentry>
-	  <term>CTDB_PARTIALLY_ONLINE_INTERFACES=yes|no</term>
-	  <listitem>
-	    <para>
-	      Whether one or more offline interfaces should cause a
-	      monitor event to fail if there are other interfaces that
-	      are up.  If this is "yes" and a node has some interfaces
-	      that are down then <command>ctdb status</command> will
-	      display the node as "PARTIALLYONLINE".
-	    </para>
-
-	    <para>
-	      Note that CTDB_PARTIALLY_ONLINE_INTERFACES=yes is
-	      incompatible with NAT gateway, since NAT gateway relies
-	      on the interface configured by CTDB_NATGW_PUBLIC_IFACE
-	      to be up.
-	    </para>
-
-	    <para>
-	      Default is "no".
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-      </variablelist>
-    </refsect2>
-
   </refsect1>
 
   <refsect1>