LU-1757 brw: added OBDO short io flag

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

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index c12ab5c..efbbd3b 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"
 
@@ -555,6 +562,9 @@ 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
 
@@ -999,6 +1009,8 @@ test_14() {
 run_test 14 "OI scrub can repair objects under lost+found"
 
 test_15() {
+       # skip test_15 for LU-4182
+       [ $MDSCOUNT -ge 2 ] && skip "skip now for >= 2 MDTs" && return
        scrub_prep 20
        scrub_backup_restore 1
        echo "starting MDTs with OI scrub disabled"