LU-4629 ldlm: fix uninitialized variable

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

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 69f9eb3..b6fad5a 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -44,6 +44,10 @@ setupall
 [[ $(lustre_version_code ost1) -lt $(version_code 2.5.55) ]] &&
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14 15 16 17 18 19"
 
+[ $(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
@@ -1269,6 +1273,8 @@ test_14() {
        createmany -o $DIR/$tdir/f $((count + 32))
        do_facet ost1 $LCTL set_param fail_loc=0
 
+       start_full_debug_logging
+
        # exhaust other pre-created dangling cases
        count=$(precreated_ost_obj_count 0 0)
        createmany -o $DIR/$tdir/a $count ||
@@ -1312,6 +1318,7 @@ test_14() {
 
        echo "'ls' should success after layout LFSCK repairing"
        ls -ail $DIR/$tdir > /dev/null || error "(9) ls should success."
+       stop_full_debug_logging
 }
 run_test 14 "LFSCK can repair MDT-object with dangling reference"
 
@@ -1684,11 +1691,11 @@ test_18b() {
        fi
 
        echo "Move the files from ./lustre/lost+found/MDTxxxx to namespace"
-       mv $MOUNT/.lustre/lost+found/MDT0000/R-${fid1} $DIR/$tdir/a1/f1 ||
-       error "(5) Fail to move $MOUNT/.lustre/lost+found/MDT0000/R-${fid1}"
+       mv $MOUNT/.lustre/lost+found/MDT0000/${fid1}-R-0 $DIR/$tdir/a1/f1 ||
+       error "(5) Fail to move $MOUNT/.lustre/lost+found/MDT0000/${fid1}-R-0"
 
        if [ $MDSCOUNT -ge 2 ]; then
-               local name=$MOUNT/.lustre/lost+found/MDT0001/R-${fid2}
+               local name=$MOUNT/.lustre/lost+found/MDT0001/${fid2}-R-0
                mv $name $DIR/$tdir/a2/f2 || error "(6) Fail to move $name"
        fi
 
@@ -1804,11 +1811,11 @@ test_18c() {
        fi
 
        echo "There should be some stub under .lustre/lost+found/MDT0001/"
-       ls -ail $MOUNT/.lustre/lost+found/MDT0001/N-* &&
+       ls -ail $MOUNT/.lustre/lost+found/MDT0001/*-N-0 &&
                error "(6) .lustre/lost+found/MDT0001/ should be empty"
 
        echo "There should be some stub under .lustre/lost+found/MDT0000/"
-       ls -ail $MOUNT/.lustre/lost+found/MDT0000/N-* ||
+       ls -ail $MOUNT/.lustre/lost+found/MDT0000/*-N-0 ||
                error "(7) .lustre/lost+found/MDT0000/ should not be empty"
 }
 run_test 18c "Find out orphan OST-object and repair it (3)"
@@ -1869,11 +1876,6 @@ test_18d() {
                awk '/^status/ { print \\\$2 }'" "scanning-phase2" 6 ||
                error "(3.0) MDS1 is not the expected 'scanning-phase2'"
 
-       # LU-3469: before osp_sync() is enabled, wait for a while to guarantee
-       # that former async repair operations have been executed on the OST(s).
-       sync
-       sleep 2
-
        do_facet $SINGLEMDS $LCTL set_param fail_val=0 fail_loc=0
 
        for k in $(seq $MDSCOUNT); do
@@ -2002,7 +2004,7 @@ test_18e() {
                error "(6) Expect 1 orphan has been fixed, but got: $repaired"
 
        echo "There should be stub file under .lustre/lost+found/MDT0000/"
-       local cname=$(ls $MOUNT/.lustre/lost+found/MDT0000/C-*)
+       local cname=$(ls $MOUNT/.lustre/lost+found/MDT0000/*-C-0)
        [ ! -z $name ] ||
                error "(7) .lustre/lost+found/MDT0000/ should not be empty"
 
@@ -2202,9 +2204,9 @@ test_20() {
        LOV_PATTERN_F_HOLE=0x40000000
 
        #
-       # R-${fid0} is the old f0
+       # ${fid0}-R-0 is the old f0
        #
-       local name="$MOUNT/.lustre/lost+found/MDT0000/R-${fid0}"
+       local name="$MOUNT/.lustre/lost+found/MDT0000/${fid0}-R-0"
        echo "Check $name, which is the old f0"
 
        $LFS getstripe -v $name || error "(5.1) cannot getstripe on $name"
@@ -2237,9 +2239,9 @@ test_20() {
        rm -f $name || error "(5.9) cannot unlink $name"
 
        #
-       # R-${fid1} contains the old f1's stripe1 (and stripe2 if OSTs > 2)
+       # ${fid1}-R-0 contains the old f1's stripe1 (and stripe2 if OSTs > 2)
        #
-       name="$MOUNT/.lustre/lost+found/MDT0000/R-${fid1}"
+       name="$MOUNT/.lustre/lost+found/MDT0000/${fid1}-R-0"
        if [ $OSTCOUNT -gt 2 ]; then
                echo "Check $name, it contains the old f1's stripe1 and stripe2"
        else
@@ -2293,9 +2295,9 @@ test_20() {
        rm -f $name || error "(6.13) cannot unlink $name"
 
        #
-       # R-${fid2} it contains the old f2's stripe0 (and stripe2 if OSTs > 2)
+       # ${fid2}-R-0 it contains the old f2's stripe0 (and stripe2 if OSTs > 2)
        #
-       name="$MOUNT/.lustre/lost+found/MDT0000/R-${fid2}"
+       name="$MOUNT/.lustre/lost+found/MDT0000/${fid2}-R-0"
        if [ $OSTCOUNT -gt 2 ]; then
                echo "Check $name, it contains the old f2's stripe0 and stripe2"
        else
@@ -2369,9 +2371,9 @@ test_20() {
        [ $OSTCOUNT -le 2 ] && return
 
        #
-       # R-${fid3} should contains the old f3's stripe0 and stripe1
+       # ${fid3}-R-0 should contains the old f3's stripe0 and stripe1
        #
-       name="$MOUNT/.lustre/lost+found/MDT0000/R-${fid3}"
+       name="$MOUNT/.lustre/lost+found/MDT0000/${fid3}-R-0"
        echo "Check $name, which contains the old f3's stripe0 and stripe1"
 
        $LFS getstripe -v $name || error "(8.1) cannot getstripe on $name"