LU-13773 tests: subscript failure propagation

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

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index 0b2ecd3..9385c21 100644 (file)
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -19,8 +19,8 @@ ALWAYS_EXCEPT="$SANITY_DOM_EXCEPT"
 
 build_test_filter
 
-[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] ||
-       { skip "Need MDS version at least 2.10.56"; exit 0; }
+[[ "$MDS1_VERSION" -ge $(version_code 2.10.56) ]] ||
+       skip "Need MDS version at least 2.10.56"
 
 OPENFILE=${OPENFILE:-openfile}
 MOUNT_2=${MOUNT_2:-"yes"}
@@ -155,6 +155,19 @@ test_6() {
 }
 run_test 6 "Race two writes, check file size"
 
+test_7() {
+       dd if=/dev/zero of=$DIR1/$tfile bs=1000 count=1
+       cancel_lru_locks
+
+       $MULTIOP $DIR1/$tfile or1000c
+       dd if=/dev/urandom of=$DIR2/$tfile bs=1000 count=1
+       local md5_1=$(md5sum $DIR/$tfile | awk '{ print $1 }')
+       local md5_2=$(md5sum $DIR2/$tfile | awk '{ print $1 }')
+       [[ $md5_1 == $md5_2 ]] ||
+               error "Client reads stale page"
+}
+run_test 7 "Stale pages after read-on-open"
+
 test_fsx() {
        local file1=$DIR1/$tfile
        local file2=$DIR2/$tfile
@@ -166,23 +179,31 @@ run_test fsx "Dual-mount fsx with DoM files"
 
 test_sanity()
 {
+       SANITY_ONLY=${SANITY_ONLY:-"36 39 40 41 42d 42e 43 46 56r 101e 119a \
+                                   131 150 155a 155b 155c 155d 207 241 251"}
+       SANITY_REPEAT=${SANITY_REPEAT:-1}
        # XXX: to fix 45. Add 42a, c when LU-9693 fixed.
        # Add 42b when LU-6493 fixed
-       # Enable 39k when LU-10496 fixed
-       ONLY="36 39 40 41 42d 42e 43 46 56r 101e 119a 131 150 155a 155b 155c \
-               155d 207 241 251" \
-               EXCEPT=39k OSC="mdc" DOM="yes" bash sanity.sh
+       ONLY=$SANITY_ONLY ONLY_REPEAT=$SANITY_REPEAT OSC="mdc" DOM="yes" \
+               bash sanity.sh
+
+       return 0
 }
 run_test sanity "Run sanity with Data-on-MDT files"
 
 test_sanityn()
 {
+       SANITYN_ONLY=${SANITYN_ONLY:-"1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
+                                     23 27 39 51a 51c 51d"}
+       SANITYN_REPEAT=${SANITYN_REPEAT:-1}
        # XXX: to fix 60
-       ONLY="1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 23 27 39 51a 51c 51d" \
-               OSC="mdc" DOM="yes" bash sanityn.sh
+       ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \
+               bash sanityn.sh
+
+       return 0
 }
 run_test sanityn "Run sanityn with Data-on-MDT files"
 
 complete $SECONDS
 check_and_cleanup_lustre
-exit_status
+exit_status "${TMP}/sanity.log ${TMP}/sanityn.log"