LU-10193 osd-ldiskfs: backup index object with plain format

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

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index 6df949b..4cdb37e 100644 (file)
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -20,6 +20,9 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] ||
+       { skip "Need MDS version at least 2.10.56"; exit 0; }
+
 MULTIOP=${MULTIOP:-multiop}
 OPENFILE=${OPENFILE:-openfile}
 MOUNT_2=${MOUNT_2:-"yes"}
@@ -39,13 +42,18 @@ DOM="yes"
 DOM_SIZE=${DOM_SIZE:-"$((1024*1024))"}
 OSC="mdc"
 
-lfs setstripe -E $DOM_SIZE -L mdt -E EOF $DIR1
+trap restore_default_layout EXIT
+restore_default_layout() {
+       [ -n "$saved_layout" ] && restore_layout $DIR1 $saved_layout ||
+               $LFS setstripe -d $DIR1
+}
+
+saved_layout=$(save_layout $DIR1)
+$LFS setstripe -E $DOM_SIZE -L mdt -E EOF $DIR1
 
 mkdir -p $MOUNT2
 mount_client $MOUNT2
 
-lctl set_param debug=0xffffffff 2> /dev/null
-
 test_1() {
        dd if=/dev/zero of=$DIR1/$tfile bs=7k count=1 || error "write 1"
        $TRUNCATE $DIR2/$tfile 1000 || error "truncate"
@@ -95,25 +103,19 @@ run_test fsx "Dual-mount fsx with DoM files"
 
 test_sanity()
 {
-       local SAVE_ONLY=$ONLY
-
-       [ ! -f sanity.sh ] && skip_env "No sanity.sh skipping" && return
+       [[ -f sanity.sh ]] || { skip "sanity.sh doesn't exist"; return 0; }
        # XXX: to fix 45
        ONLY="36 39 40 41 42 43 46 56r 101e 119a 131 150 155a 155b 155c \
-               155d 207 241 251" OSC="mdc" DOM="yes" sh sanity.sh
-       ONLY=$SAVE_ONLY
+               155d 207 241 251" OSC="mdc" DOM="yes" bash sanity.sh
 }
 run_test sanity "Run sanity with Data-on-MDT files"
 
 test_sanityn()
 {
-       local SAVE_ONLY=$ONLY
-
-       [ ! -f sanity.sh ] && skip_env "No sanity.sh skipping" && return
+       [[ -f sanityn.sh ]] || { skip "sanityn.sh doesn't exist"; return 0; }
        # 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" sh sanityn.sh
-       ONLY=$SAVE_ONLY
+               OSC="mdc" DOM="yes" bash sanityn.sh
 }
 run_test sanityn "Run sanityn with Data-on-MDT files"