b=18909

i=Adilger
t-f fix for mgs different from MDSDEV

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index dea4a2d..200d4f2 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -17,6 +17,9 @@ MDSOPT=${MDSOPT:-"--mountfsoptions=acl"}
 
 mdsfailover_dev=${mdsfailover_dev:-$MDSDEV}
 
+MGSDEV=${MGSDEV:-$MDSDEV}
+MGSSIZE=${MGSSIZE:-$MDSSIZE}
+
 OSTCOUNT=${OSTCOUNT:-2}
 OSTDEVBASE=${OSTDEVBASE:-$TMP/${FSNAME}-ost}
 OSTSIZE=${OSTSIZE:-300000}
@@ -57,7 +60,13 @@ MKFSOPT=""
     MDSOPT=$MDSOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
 [ "x$L_GETGROUPS" != "x" ] &&
     MDSOPT=$MDSOPT" --param mdt.group_upcall=$L_GETGROUPS"
-MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MDSOPT $MDS_MKFS_OPTS"
+MDS_MKFS_OPTS="--mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MDSOPT $MDS_MKFS_OPTS"
+if [[ $mds_HOST == $mgs_HOST ]] && [[ $MDSDEV == $MGSDEV ]]; then
+    MDS_MKFS_OPTS="--mgs $MDS_MKFS_OPTS"
+else
+    MDS_MKFS_OPTS="--mgsnode=$MGSNID $MDS_MKFS_OPTS"
+    mgs_MKFS_OPTS="--mgs "
+fi
 
 MKFSOPT=""
 [ "x$OSTJOURNALSIZE" != "x" ] &&

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index afeabe4..4c835b2 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -139,7 +139,6 @@ init_test_env() {
 
     [ "$TESTSUITELOG" ] && rm -f $TESTSUITELOG || true
     rm -f $TMP/*active
-
 }
 
 case `uname -r` in
@@ -540,7 +539,7 @@ sanity_mount_check_servers () {
     echo Checking servers environments
 
     # FIXME: modify get_facets to display all facets wo params
-    local facets="$(get_facets OST),$(get_facets MDS)"
+    local facets="$(get_facets OST),$(get_facets MDS),mgs"
     local node
     local mnt
     local facet
@@ -1347,6 +1346,10 @@ stopall() {
         stop ost$num -f
         rm -f $TMP/ost${num}active
     done
+    if [[ $MDSDEV != $MGSDEV ]]; then
+        stop mgs 
+    fi
+
     return 0
 }
 
@@ -1364,7 +1367,11 @@ formatall() {
     # We need ldiskfs here, may as well load them all
     load_modules
     [ "$CLIENTONLY" ] && return
-    echo Formatting mds, osts
+    echo Formatting mgs, mds, osts
+    if [[ $MDSDEV != $MGSDEV ]] || [[ $mds_HOST != $mgs_HOST ]]; then
+        add mgs $mgs_MKFS_OPTS $FSTYPE_OPT --reformat $MGSDEV || exit 10
+    fi
+
     if $VERBOSE; then
         add mds $MDS_MKFS_OPTS $FSTYPE_OPT --reformat $MDSDEV || exit 10
     else
@@ -1414,11 +1421,15 @@ setupall() {
 
     load_modules
     if [ -z "$CLIENTONLY" ]; then
-        echo Setup mdt, osts
+        echo Setup mgs, mdt, osts
 
         echo $WRITECONF | grep -q "writeconf" && \
             writeconf_all
 
+        if [[ $mds_HOST != $mgs_HOST ]] || [[ $MDSDEV != $MGSDEV ]]; then
+            start mgs $MGSDEV $mgs_MOUNT_OPTS
+        fi
+
         start mds $MDSDEV $MDS_MOUNT_OPTS
         # We started mds, now we should set failover variable properly.
         # Set mdsfailover_HOST if it is not set (the default failnode).