smfs support in basic tests

MDS_BACKFSTYPE and OST_BACKFSTYPE are defined for this.
FSTYPE is ldiskfs for 2.6 kernel by default

diff --git a/lustre/tests/lmv.sh b/lustre/tests/lmv.sh
index b2270f4..5fa797a 100755 (executable)
--- a/lustre/tests/lmv.sh
+++ b/lustre/tests/lmv.sh
@@ -10,13 +10,17 @@ LMC=${LMC:-lmc}
 TMP=${TMP:-/tmp}
 
 MDSSIZE=${MDSSIZE:-100000}
-FSTYPE=${FSTYPE:-ext3}
 MDSCOUNT=${MDSCOUNT:-3}
-
 OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-200000}
 OSTCOUNT=${OSTCOUNT:-1}
 
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+#used only if FSTYPE == smfs, otherwise ignored by lconf
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
+
 # 1 to config an echo client instead of llite
 ECHO_CLIENT=${ECHO_CLIENT:-}
 
@@ -42,7 +46,8 @@ ${LMC} -m $config --add lmv --lmv lmv1 || exit 12
 for num in `seq $MDSCOUNT`; do
     MDSDEV=$TMP/mds${num}-`hostname`
     ${LMC} -m $config --format --add mds --node localhost --mds mds${num} \
-        --lmv lmv1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 13
+        --lmv lmv1 --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
+        --size $MDSSIZE || exit 13
 done
 
 ${LMC} -m $config --add lov --lov lov1 --lmv lmv1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
@@ -52,7 +57,7 @@ for num in `seq $OSTCOUNT`; do
     OST=ost$num
     DEVPTR=OSTDEV$num
     eval $DEVPTR=${!DEVPTR:=$TMP/$OST-`hostname`}
-    ${LMC} -m $config --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
+    ${LMC} -m $config --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --backfstype $OST_BACKFSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
 done
 
 ${LMC} -m $config --add mtpt --node localhost --path $MOUNT --lmv lmv1 --lov lov1 || exit 40

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index 598ece5..1160597 100755 (executable)
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -11,11 +11,16 @@ TMP=${TMP:-/tmp}
 
 MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 MDSSIZE=${MDSSIZE:-400000}
-FSTYPE=${FSTYPE:-ext3}
 MOUNT=${MOUNT:-/mnt/lustre}
 MOUNT2=${MOUNT2:-${MOUNT}2}
 NETTYPE=${NETTYPE:-tcp}
 
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+#used only if FSTYPE == smfs, otherwise ignored by lconf
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
+
 OSTCOUNT=${OSTCOUNT:-5}
 # OSTDEVN will still override the device for OST N
 
@@ -40,7 +45,7 @@ ${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
 
 
 # configure mds server
-${LMC} --format --add mds --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
+${LMC} --format --add mds --node localhost --mds mds1 --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
 
 # configure ost
 ${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
@@ -49,7 +54,8 @@ for num in `seq $OSTCOUNT`; do
     OST=ost$num
     DEVPTR=OSTDEV$num
     eval $DEVPTR=${!DEVPTR:=$TMP/$OST-`hostname`}
-    ${LMC} --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
+    ${LMC} --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --backfstype $OST_BACKFSTYPE \
+           --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
 done
 
 

diff --git a/lustre/tests/lsmfs.sh b/lustre/tests/lsmfs.sh
index d83df12..a3dc87c 100755 (executable)
--- a/lustre/tests/lsmfs.sh
+++ b/lustre/tests/lsmfs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
-MDSDEV=smfs OSTDEV=smfs FSTYPE=smfs MDS_MOUNT_OPTS="" OST_MOUNT_OPTS="" \
-OSTSIZE=100000 MDSSIZE=100000 MDS_BACKFSTYPE=ext3 OST_BACKFSTYPE=ext3 \
-MDS_BACKDEV=/tmp/mds1-$(hostname) OST_BACKDEV=/tmp/ost1-$(hostname) sh llmount.sh
+# this is framework that sets env for SMFS before exec scripts
+FSTYPE=smfs MDS_MOUNT_OPTS="" OST_MOUNT_OPTS="" \
+MDS_BACKFSTYPE=ldiskfs OST_BACKFSTYPE=ldiskfs \
+MDSDEV=/tmp/mds1-$(hostname) OSTDEV=/tmp/ost1-$(hostname) sh $1

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 27c466f..de1bc8e 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -9,6 +9,7 @@ set -e
 ONLY=${ONLY:-"$*"}
 # bug number for skipped tests:
 # skipped test: 
+# - 48a is obsolete due to new_kernel_api
 # - 51b 51c depend on used kernel
 #   more than only LOV EAs
 # - 65h (default stripe inheritance) is not implemented for LMV 
@@ -26,6 +27,9 @@ export SECURITY=${SECURITY:-"null"}
 TMP=${TMP:-/tmp}
 DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
 FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+#used only if FSTYPE == smfs, otherwise ignored by lconf
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
 
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
 CREATETEST=${CREATETEST:-createtest}
@@ -1952,7 +1956,7 @@ check_fstype() {
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
         modprobe $FSTYPE > /dev/null 2>&1
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
-       test "x$(uname -r | grep -o '2.6')" = "x2.6" && MODEXT="ko" || MODEXT="o"
+        test "x$(uname -r | grep -o '2.6')" = "x2.6" && MODEXT="ko" || MODEXT="o"
         insmod ../$FSTYPE/$FSTYPE.$MODEXT > /dev/null 2>&1
         test "x$FSTYPE" = "x$(grep $FSTYPE /proc/filesystems)" && return 0
         return 1
@@ -1962,7 +1966,11 @@ test_55() {
         rm -rf $DIR/d55
         mkdir $DIR/d55
         check_fstype && echo "can't find fs $FSTYPE, skipping test 55" && return
-        mount -t $FSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting"
+        if [ "$FSTYPE" == "smfs" ] ; then
+           mount -t $MDS_BACKFSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting"
+       else
+           mount -t $FSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting"
+       fi
        touch $DIR/d55/foo
         $IOPENTEST1 $DIR/d55/foo $DIR/d55 || error "running $IOPENTEST1"
         $IOPENTEST2 $DIR/d55 || error "running $IOPENTEST2"

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 66965ed..20ebdc1 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -38,7 +38,12 @@ init_test_env() {
     export LMC=${LMC:-"lmc"}
     export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
     export CHECKSTAT="${CHECKSTAT:-checkstat} "
-    export FSYTPE=${FSTYPE:-"ext3"}
+    DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+    export FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+    #used only if FSTYPE == smfs, otherwise ignored by lconf
+    MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+    OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
+
     export SECURITY=${SECURITY:-"null"}
 
     # Paths on remote nodes, if different 
@@ -350,14 +355,14 @@ add_mds() {
     shift
     rm -f ${facet}active
     add_facet $facet
-    do_lmc --add mds --node ${facet}_facet --mds ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add mds --node ${facet}_facet --mds ${facet}_svc --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE $*
 }
 
 add_mdsfailover() {
     facet=$1
     shift
     add_facet ${facet}failover  --lustre_upcall $UPCALL
-    do_lmc --add mds  --node ${facet}failover_facet --mds ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add mds  --node ${facet}failover_facet --mds ${facet}_svc --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE $*
 }
 
 add_ost() {
@@ -365,7 +370,7 @@ add_ost() {
     shift
     rm -f ${facet}active
     add_facet $facet
-    do_lmc --add ost --node ${facet}_facet --ost ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add ost --node ${facet}_facet --ost ${facet}_svc --fstype $FSTYPE --backfstype $OST_BACKFSTYPE $*
 }
 
 del_ost() {
@@ -384,7 +389,7 @@ add_ostfailover() {
     facet=$1
     shift
     add_facet ${facet}failover
-    do_lmc --add ost --failover --node ${facet}failover_facet --ost ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add ost --failover --node ${facet}failover_facet --ost ${facet}_svc --fstype $FSTYPE --backfstype $OST_BACKFSTYPE $*
 }
 
 add_lov() {