Branch b1_8

b=18501
i=nathan

Document the limitation for lustre_config in the upgrading case and
specify "--nomgs" option to a non-co-located MDT.

diff --git a/lustre/scripts/lustre_config.in b/lustre/scripts/lustre_config.in
index fcdf45f..c72bd4a 100644 (file)
--- a/lustre/scripts/lustre_config.in
+++ b/lustre/scripts/lustre_config.in
@@ -65,6 +65,10 @@ that will be part of the Lustre cluster.
 
 It can also optionally: 
  * upgrade Lustre targets from 1.4 to 1.6
+   It does not support "rolling upgrade". Before upgrading, the entire Lustre
+   filesystem (all servers and clients) need be shut down. After upgrading, old
+   configuration logs for the filesystem would be erased and new configuration
+   logs would be regenerated as Lustre servers restart.
  * verify the network connectivity and hostnames in the cluster
  * configure Linux MD/LVM devices
  * modify /etc/modprobe.conf to add Lustre networking info
@@ -334,6 +338,8 @@ construct_mkfs_cmdline() {
         ;;
     "mdt")
         MKFS_CMD="$MKFS_CMD --mdt"
+        $UPGRADE_TARGET && [ -n "${MGS_NIDS[i]}" ] && \
+        MKFS_CMD="$MKFS_CMD --nomgs"
         ;;
     "mgs")
         MKFS_CMD="$MKFS_CMD --mgs"