LUDOC-31 manual: add --servicenode option description

Add --servicenode option description for mkfs.lustre and tune.lustre.

Change XSL_REL in Makefile so that make gets correct install path of
different version of docbook5 XSL stylesheets package.

Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: If92af7e0839928ddfeb966090d75796c93b8499e

diff --git a/LustreMaintenance.xml b/LustreMaintenance.xml
index 6c75b6e..4246d3d 100644 (file)
--- a/LustreMaintenance.xml
+++ b/LustreMaintenance.xml
@@ -490,7 +490,11 @@ osc.lustre-OST0004-osc-f1579000.ost_conn_uuid=192.168.20.1@tcp</screen></para>
     <section xml:id="dbdoclet.50438199_62333">
       <title><indexterm><primary>maintance</primary><secondary>changing failover node address</secondary></indexterm>
 Changing the Address of a Failover Node</title>
-      <para>To change the address of a failover node (e.g, to use node X instead of node Y), run this command on the OSS/OST partition: <screen>tunefs.lustre --erase-params --failnode=&lt;NID&gt; &lt;device&gt; </screen></para>
+      <para>To change the address of a failover node (e.g, to use node X instead of node Y), run this command on the OSS/OST partition:
+             <screen>tunefs.lustre --erase-params --failnode=&lt;NID&gt; &lt;device&gt; </screen>
+             or
+             <screen>tunefs.lustre --erase-params --servicenode=&lt;NID&gt; &lt;device&gt; </screen>
+      </para>
     </section>
   </section>
 </chapter>

diff --git a/LustreOperations.xml b/LustreOperations.xml
index 397a4e2..67bbcc7 100644 (file)
--- a/LustreOperations.xml
+++ b/LustreOperations.xml
@@ -271,7 +271,7 @@ osc.myth-OST0004-osc-ffff8800376bdc00.cur_grant_bytes=33808384</screen>
   </section>
   <section xml:id="dbdoclet.50438194_41817">
     <title><indexterm><primary>operations</primary><secondary>failover</secondary></indexterm>Specifying NIDs and Failover</title>
-    <para>If a node has multiple network interfaces, it may have multiple NIDs. When a node is specified, all of its NIDs must be listed, delimited by commas (<literal>,</literal>) so other nodes can choose the NID that is appropriate for their network interfaces. When failover nodes are specified, they are delimited by a colon (<literal>:</literal>) or by repeating a keyword (<literal>--mgsnode=</literal> or <literal>--failnode=</literal>). To obtain all NIDs from a node (while LNET is running), run:</para>
+    <para>If a node has multiple network interfaces, it may have multiple NIDs. When a node is specified, all of its NIDs must be listed, delimited by commas (<literal>,</literal>) so other nodes can choose the NID that is appropriate for their network interfaces. When failover nodes are specified, they are delimited by a colon (<literal>:</literal>) or by repeating a keyword (<literal>--mgsnode=</literal> or <literal>--failnode=</literal> or <literal>--servicenode=</literal>). To obtain all NIDs from a node (while LNET is running), run:</para>
     <screen>lctl list_nids</screen>
     <para>This displays the server&apos;s NIDs (networks configured to work with Lustre).</para>
     <para>This example has a combined MGS/MDT failover pair on mds0 and mds1, and a OST failover pair on oss0 and oss1. There are corresponding Elan addresses on mds0 and mds1.</para>
@@ -285,6 +285,7 @@ mds0&gt; umount /mnt/mdt
 mds1&gt; mount -t lustre /dev/sda1 /mnt/test/mdt
 mds1&gt; cat /proc/fs/lustre/mds/testfs-MDT0000/recovery_status</screen>
     <para>Where multiple NIDs are specified, comma-separation (for example, <literal>mds1,2@elan</literal>) means that the two NIDs refer to the same host, and that Lustre needs to choose the &quot;best&quot; one for communication. Colon-separation (for example, <literal>mds0:mds1</literal>) means that the two NIDs refer to two different hosts, and should be treated as failover locations (Lustre tries the first one, and if that fails, it tries the second one.)</para>
+    <para>Two options exist to specify failover nodes. <literal>--failnode</literal> and <literal>--servicenode</literal>. <literal>--failnode</literal> specifies the NIDs of failover nodes. <literal>--servicenode</literal> specifies all service NIDs, including those of the primary node and of failover nodes.  Option <literal>--servicenode</literal> makes the MDT or OST treat all its service nodes equally. The first service node to load the target device becomes the primary service node. Other node NIDs will become failover locations for the target device.</para>
     <note>
       <para>If you have an MGS or MDT configured for failover, perform these steps:</para>
       <orderedlist>

diff --git a/Makefile b/Makefile
index 6fa2c86..335ee38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,11 @@ RNG=$(or $(shell ls $(RNG_UBN) 2> /dev/null), \
         $(shell ls $(RNG_MAC) 2> /dev/null))
 XSL_UBN=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
 XSL_REL=/usr/share/sgml/docbook/xsl-ns-stylesheets-1.75.2
+XSL_F16=/usr/share/sgml/docbook/xsl-ns-stylesheets
 XSL_MAC=/opt/local/share/xsl/docbook-xsl
 XSL=$(or $(shell ls -d $(XSL_UBN) 2> /dev/null), \
         $(shell ls -d $(XSL_REL) 2> /dev/null), \
+        $(shell ls -d $(XSL_F16) 2> /dev/null), \
         $(shell ls -d $(XSL_MAC) 2> /dev/null))
 
 .PHONY: all

diff --git a/SystemConfigurationUtilities.xml b/SystemConfigurationUtilities.xml
index 5d40c5e..2075b63 100644 (file)
--- a/SystemConfigurationUtilities.xml
+++ b/SystemConfigurationUtilities.xml
@@ -1573,6 +1573,16 @@ mkfs.lustre</title>
               </entry>
               <entry>
                 <para> Sets the NID(s) of a failover partner. This option can be repeated as needed.</para>
+                <para><emphasis role="bold">CAUTION</emphasis>: Cannot be used with <emphasis role="bold">--servicenode</emphasis>.</para>
+              </entry>
+            </row>
+            <row>
+              <entry nameend="c2" namest="c1">
+                <para> <emphasis role="bold">--servicenode</emphasis>=<emphasis>nid</emphasis>,...</para>
+              </entry>
+              <entry>
+                <para> Sets the NID(s) of all service node, including failover partner as well as primary node service nids. This option can be repeated as needed.</para>
+                <para><emphasis role="bold">CAUTION</emphasis>: Cannot be used with <emphasis role="bold">--failnode</emphasis>.</para>
               </entry>
             </row>
             <row>
@@ -2252,6 +2262,16 @@ tunefs.lustre</title>
               </entry>
               <entry>
                 <para> Sets the NID(s) of a failover partner. This option can be repeated as needed.</para>
+                <para><emphasis role="bold">CAUTION</emphasis>: Cannot be used with <emphasis role="bold">--servicenode</emphasis>.</para>
+              </entry>
+            </row>
+            <row>
+              <entry>
+                <para> <emphasis role="bold">--servicenode</emphasis>=<emphasis>nid</emphasis>,...</para>
+              </entry>
+              <entry>
+                <para> Sets the NID(s) of all service node, including failover partner as well as local service nids. This option can be repeated as needed.</para>
+                <para><emphasis role="bold">CAUTION</emphasis>: Cannot be used with <emphasis role="bold">--failnode</emphasis>.</para>
               </entry>
             </row>
             <row>

diff --git a/UnderstandingFailover.xml b/UnderstandingFailover.xml
index 9d0a0b7..c6e0cd5 100644 (file)
--- a/UnderstandingFailover.xml
+++ b/UnderstandingFailover.xml
@@ -66,7 +66,7 @@
         <para>For OST failover, multiple OSS nodes are configured to be able to serve the same OST. However, only one OSS node can serve the OST at a time. An OST can be moved between OSS nodes that have access to the same storage device using <literal>umount/mount</literal> commands.</para>
       </listitem>
     </itemizedlist>
-    <para>To add a failover partner to a Lustre configuration, the <literal>--failnode</literal> option is used. This can be done at creation time (using <literal>mkfs.lustre</literal>) or later when the Lustre system is active (using <literal>tunefs.lustre</literal>). For explanations of these utilities, see <xref linkend="dbdoclet.50438219_75432"/> and <xref linkend="dbdoclet.50438219_39574"/>.</para>
+    <para>To add a failover partner to a Lustre configuration, the <literal>--failnode</literal> or <literal>--servicenode</literal> option is used. This can be done at creation time (using <literal>mkfs.lustre</literal>) or later when the Lustre system is active (using <literal>tunefs.lustre</literal>). For explanations of these utilities, see <xref linkend="dbdoclet.50438219_75432"/> and <xref linkend="dbdoclet.50438219_39574"/>.</para>
     <para>Lustre failover capability can be used to upgrade the Lustre software between successive minor versions without cluster downtime. For more information, see <xref linkend="upgradinglustre"/>.</para>
     <para>For information about configuring failover, see <xref linkend="configuringfailover"/>.</para>
     <note>