LU-1205 tests: sanityn test_18 sometimes takes long time to run

[fs/lustre-release.git] / lustre / tests / sanityn.sh

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 56eac96..dbeba23 100644 (file)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 3192 15528/3811 16929 9977 15528/11549 18080
-ALWAYS_EXCEPT="                14b  19         22    28   29          35    $SANITYN_EXCEPT"
+# bug number for skipped test: 3192 LU-1205 15528/3811 16929 9977 15528/11549 18080
+ALWAYS_EXCEPT="                14b  18c     19         22    28   29          35    $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # bug number for skipped test:        12652 12652
@@ -22,8 +22,6 @@ PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
 
 SIZE=${SIZE:-40960}
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
-GETSTRIPE=${GETSTRIPE:-lfs getstripe}
-SETSTRIPE=${SETSTRIPE:-lstripe}
 MCREATE=${MCREATE:-mcreate}
 OPENFILE=${OPENFILE:-openfile}
 OPENUNLINK=${OPENUNLINK:-openunlink}
@@ -352,7 +350,17 @@ test_17() { # bug 3513, 3667
 run_test 17 "resource creation/LVB creation race ==============="
 
 test_18() {
-       $LUSTRE/tests/mmap_sanity -d $MOUNT1 -m $MOUNT2
+        # turn e.g. ALWAYS_EXCEPT="18c" into "-e 3"
+        local idx
+        local excepts=
+        for idx in {a..z}; do
+                local ptr=EXCEPT_ALWAYS_18$idx
+                [ x${!ptr} = xtrue ] || continue
+
+                excepts="$excepts -e $(($(printf %d \'$idx)-96))"
+        done
+
+       $LUSTRE/tests/mmap_sanity -d $MOUNT1 -m $MOUNT2 $excepts
        sync; sleep 1; sync
 }
 run_test 18 "mmap sanity check ================================="
@@ -536,8 +544,8 @@ test_28() { # bug 9977
        ECHO_UUID="ECHO_osc1_UUID"
        tOST=`$LCTL dl | | awk '/-osc-|OSC.*MNT/ { print $4 }' | head -1`
 
-       lfs setstripe $DIR1/$tfile -s 1048576 -i 0 -c 2
-       tOBJID=`lfs getstripe $DIR1/$tfile |grep "^[[:space:]]\+1" |awk '{print $2}'`
+       $LFS setstripe $DIR1/$tfile -S 1048576 -i 0 -c 2
+       tOBJID=`$LFS getstripe $DIR1/$tfile | awk '$1 == 1 {print $2}'`
        dd if=/dev/zero of=$DIR1/$tfile bs=1024k count=2
 
        $LCTL <<-EOF
@@ -546,7 +554,7 @@ test_28() { # bug 9977
                setup $tOST
        EOF
 
-       tECHOID=`$LCTL dl | grep $ECHO_UUID | awk '{print $1}'`
+       tECHOID=`$LCTL dl | grep $ECHO_UUID | awk '{ print $1 }'`
        $LCTL --device $tECHOID destroy "${tOBJID}:0"
 
        $LCTL <<-EOF