LU-3594 lfsck: repair inconsistent owner and multiple referenced cases

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

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index e2017a1..fdbd97f 100644 (file)
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -42,6 +42,13 @@ check_and_setup_lustre
 [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.90) ]] &&
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 1a"
 
+[[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.4.1) ]] &&
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 15"
+
+[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.90) ]] &&
+[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.50) ]] &&
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 15"
+
 [[ $(lustre_version_code ost1) -lt $(version_code 2.4.50) ]] &&
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 11 12 13 14"
 
@@ -535,7 +542,7 @@ test_6() {
 
        local -a position1
        for n in $(seq $MDSCOUNT); do
-               positions1[$n]=$(scrub_status $n |
+               position1[$n]=$(scrub_status $n |
                        awk '/^latest_start_position/ {print $2}')
                if [ ${position0[$n]} -ne ${position1[$n]} ]; then
                        error "(14) Expected position ${position0[$n]}, but" \
@@ -555,9 +562,6 @@ test_6() {
 run_test 6 "OI scrub resumes from last checkpoint"
 
 test_7() {
-       # skip test_7 for LU-4149
-       [ $MDSCOUNT -ge 2 ] && skip "skip now for >= 2 MDTs" && return
-
        scrub_prep 500
        scrub_backup_restore 1