LU-4970 lfsck: flush async updating before exit

[fs/lustre-release.git] / lustre / tests / sanity-lfsck.sh

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index e22f841..18c6bbb 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -19,7 +19,6 @@ init_logging
 
 require_dsh_mds || exit 0
 
-MCREATE=${MCREATE:-mcreate}
 SAVED_MDSSIZE=${MDSSIZE}
 SAVED_OSTSIZE=${OSTSIZE}
 SAVED_OSTCOUNT=${OSTCOUNT}
@@ -44,10 +43,6 @@ setupall
 [[ $(lustre_version_code ost1) -lt $(version_code 2.5.55) ]] &&
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14 15 16 17 18 19 20 21"
 
-[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:        LU-4970
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 14"
-
 build_test_filter
 
 $LCTL set_param debug=+lfsck > /dev/null || true
@@ -514,7 +509,7 @@ test_6a() {
        local POS1=$($SHOW_NAMESPACE |
                     awk '/^latest_start_position/ { print $2 }' |
                     tr -d ',')
-       [ $POS0 -lt $POS1 ] ||
+       [[ $POS0 -lt $POS1 ]] ||
                error "(7) Expect larger than: $POS0, but got $POS1"
 
        do_facet $SINGLEMDS $LCTL set_param fail_loc=0 fail_val=0
@@ -572,10 +567,10 @@ test_6b() {
                       awk '/^latest_start_position/ { print $4 }')
 
        if [ "$D_POS0" == "N/A" -o "$D_POS1" == "N/A" ]; then
-               [ $O_POS0 -lt $O_POS1 ] ||
+               [[ $O_POS0 -lt $O_POS1 ]] ||
                        error "(7.1) $O_POS1 is not larger than $O_POS0"
        else
-               [ $D_POS0 -lt $D_POS1 ] ||
+               [[ $D_POS0 -lt $D_POS1 ]] ||
                        error "(7.2) $D_POS1 is not larger than $D_POS0"
        fi
 
@@ -1740,8 +1735,7 @@ test_18c() {
 
        if [ $MDSCOUNT -ge 2 ]; then
                $LFS mkdir -i 1 $DIR/$tdir/a2
-               $LFS setstripe -c 2 -i 1 -s 1M $DIR/$tdir/a2
-               do_facet ost2 $LCTL set_param fail_loc=0x1617
+               $LFS setstripe -c 1 -i 0 -s 1M $DIR/$tdir/a2
                dd if=/dev/zero of=$DIR/$tdir/a2/f2 bs=1M count=2
                $LFS getstripe $DIR/$tdir/a2/f2
        fi
@@ -1791,7 +1785,7 @@ test_18c() {
        done
 
        if [ $MDSCOUNT -ge 2 ]; then
-               expected=3
+               expected=2
        else
                expected=1
        fi
@@ -1810,7 +1804,7 @@ test_18c() {
                        error "(5) Expect 0 fixed on mds2, but got: $repaired"
        fi
 
-       echo "There should be some stub under .lustre/lost+found/MDT0001/"
+       echo "There should NOT be some stub under .lustre/lost+found/MDT0001/"
        ls -ail $MOUNT/.lustre/lost+found/MDT0001/*-N-0 &&
                error "(6) .lustre/lost+found/MDT0001/ should be empty"