LU-1187 tests: Add DNE tests to conf sanity.

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index e89d50c..b941b1c 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2790,6 +2790,7 @@ upper() {
 mkfs_opts() {
        local facet=$1
        local dev=$2
+       local fsname=${3:-"$FSNAME"}
        local type=$(facet_type $facet)
        local index=$(($(facet_number $facet) - 1))
        local fstype=$(facet_fstype $facet)
@@ -2811,7 +2812,8 @@ mkfs_opts() {
        fi
 
        if [ $type != MGS ]; then
-               opts+=" --fsname=$FSNAME --$(lower ${type/MDS/MDT}) --index=$index"
+               opts+=" --fsname=$fsname --$(lower ${type/MDS/MDT}) \
+                       --index=$index"
        fi
 
        var=${facet}failover_HOST
@@ -2945,23 +2947,31 @@ remount_client()
         zconf_mount `hostname` $1 || error "mount failed"
 }
 
-writeconf_facet () {
-    local facet=$1
-    local dev=$2
+writeconf_facet() {
+       local facet=$1
+       local dev=$2
 
-    do_facet $facet "$TUNEFS --writeconf $dev"
+       stop ${facet} -f
+       rm -f ${facet}active
+       do_facet ${facet} "$TUNEFS --quiet --writeconf $dev" || return 1
+       return 0
 }
 
 writeconf_all () {
-    for num in `seq $MDSCOUNT`; do
-        DEVNAME=$(mdsdevname $num)
-        writeconf_facet mds$num $DEVNAME
-    done
+       local mdt_count=${1:-$MDSCOUNT}
+       local ost_count=${2:-$OSTCOUNT}
+       local rc=0
 
-    for num in `seq $OSTCOUNT`; do
-        DEVNAME=$(ostdevname $num)
-        writeconf_facet ost$num $DEVNAME
-    done
+       for num in $(seq $mdt_count); do
+               DEVNAME=$(mdsdevname $num)
+               writeconf_facet mds$num $DEVNAME || rc=$?
+       done
+
+       for num in $(seq $ost_count); do
+               DEVNAME=$(ostdevname $num)
+               writeconf_facet ost$num $DEVNAME || rc=$?
+       done
+       return $rc
 }
 
 setupall() {