LU-10670 test: make sanity-flr test_43 more reliable

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

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index 372f9ba..3f9083b 100644 (file)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -374,7 +374,8 @@ component_dump() {
 
 test_10() {
        local parent=$DIR/$tdir
-       local root_layout=$(get_layout_param $MOUNT)
+
+       save_layout_restore_at_exit $MOUNT
 
        rm -rf $parent
        $LFS setstripe -d $MOUNT || error "clear root layout"
@@ -413,7 +414,6 @@ test_10() {
        [  x$f2_expect != x$f2_entry ] &&
                error "$parent/file2 does not inherite root layout"
 
-       $LFS setstripe $root_layout $MOUNT
        return 0
 }
 run_test 10 "Inherit composite template from root"
@@ -451,7 +451,7 @@ test_11() {
        $TRUNCATE $comp_file $((1024*1024*1+1))
 
        f2=$($LFS getstripe -I2 $comp_file | grep "l_fid")
-       [[ -z $f2 ]] && error "2: 2nd component uninstantiated"
+       [[ -z $f2 ]] && error "3: 2nd component uninstantiated"
        f3=$($LFS getstripe -I3 $comp_file | grep "l_fid")
        [[ -z $f3 ]] && error "3: 3rd component uninstantiated"
        f4=$($LFS getstripe -I4 $comp_file | grep "l_fid")