LU-13584 tests: gather_logs() fix

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

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index a95d62b..963b1f7 100644 (file)
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -67,14 +67,14 @@ test_3() {
        # Write on one node to the DoM stripe and then truncate to over DoM size
        dd if=/dev/zero of=$DIR1/$tfile bs=$((DOM_SIZE-100)) count=1 ||
                return 1
-       truncate $DIR1/$tfile $((DOM_SIZE+700)) || return 2
+       $TRUNCATE $DIR1/$tfile $((DOM_SIZE+700)) || return 2
        # read on the second node inside DoM stripe to take a lock data from
        # the first client
        dd if=$DIR2/$tfile of=/dev/null bs=4096 count=1 seek=1 || return 3
        $CHECKSTAT -t file -s $((DOM_SIZE+700)) $DIR2/$tfile ||
                error "Wrong size after first truncate $tfile on first node"
        # now do local truncate over DoM size and check size is correct
-       truncate $DIR2/$tfile $((DOM_SIZE+500)) || return 4
+       $TRUNCATE $DIR2/$tfile $((DOM_SIZE+500)) || return 4
        $CHECKSTAT -t file -s $((DOM_SIZE+500)) $DIR2/$tfile ||
                error "Wrong size after second truncate on the same node"
        $CHECKSTAT -t file -s $((DOM_SIZE+500)) $DIR1/$tfile ||
@@ -172,8 +172,10 @@ test_fsx() {
        local file1=$DIR1/$tfile
        local file2=$DIR2/$tfile
 
+       check_set_fallocate
+
        touch $file1
-       fsx -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
+       $FSX -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
 }
 run_test fsx "Dual-mount fsx with DoM files"
 
@@ -195,6 +197,11 @@ 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"}
+
+       if [[ $MDS1_VERSION -ge $(version_code 2.13.55) ]]; then
+               SANITYN_ONLY+=" 107"
+       fi
+
        SANITYN_REPEAT=${SANITYN_REPEAT:-1}
        # XXX: to fix 60
        ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \
@@ -206,4 +213,4 @@ 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"