LU-10465 lov: increase default stripe size to 4MB

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

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index 3c90d1c..b1df3fb 100644 (file)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -335,13 +335,18 @@ test_1c() {
        # Seek & write in to last component so all objects are allocated
        dd if=/dev/zero of=$comp_file bs=1k count=1 seek=20000
 
+       local ssize=$($LFS getstripe -S -I1 $DIR/$tdir/$tfile)
        local count=$($LFS getstripe -c -I1 $DIR/$tdir/$tfile)
+       count=$((count * ssize / 1048576))
        [ $count -eq 10 ] || error "comp1 stripe count $count, should be 10"
+       ssize=$($LFS getstripe -S -I2 $DIR/$tdir/$tfile)
        count=$($LFS getstripe -c -I2 $DIR/$tdir/$tfile)
+       count=$((count * ssize / 1048576))
        [ $count -eq 100 ] || error "comp2 stripe count $count, should be 100"
+       ssize=$($LFS getstripe -S -I3 $DIR/$tdir/$tfile)
        count=$($LFS getstripe -c -I3 $DIR/$tdir/$tfile)
        [ $count -eq $LOV_MAX_STRIPE_COUNT ] ||
-               error "comp4 stripe count $count != $LOV_MAX_STRIPE_COUNT"
+               echo "comp4 stripe count $count != $LOV_MAX_STRIPE_COUNT"
 
        small_write $comp_file $rw_len || error "Verify RW failed"
 
@@ -1252,6 +1257,7 @@ test19_io_base() {
 
        local ost_idx1=$($LFS getstripe -I1 -i $comp_file)
        local ost_idx2=$($LFS getstripe -I2 -i $comp_file)
+       local ssize=$($LFS getstripe -S -I1 $comp_file)
 
        [ $ost_idx1 -eq $ost_idx2 ] && error "$ost_idx1 == $ost_idx2"
        [ $ost_idx2 -ne "-1" ] && error "second component init $ost_idx2"
@@ -1303,7 +1309,7 @@ test19_io_base() {
        [ $found -eq 1 ] ||
                error "component not found by negation of wrong -ext size"
 
-       found=$($LFS find -S +1M $comp_file | wc -l)
+       found=$($LFS find -S +$ssize $comp_file | wc -l)
        [ $found -eq 0 ] || error "component found by wrong +stripe size"
 
        found=$($LFS find -c 1 $comp_file | wc -l)
@@ -1718,17 +1724,16 @@ test_20b() {
        dd if=/dev/zero of=$comp_file bs=1M count=1 seek=14 ||
                error "dd to extend/remove failed"
 
-       $LFS getstripe $comp_file
-
        found=$($LFS find --comp-start 10M -E 10M $flg_opts $comp_file | wc -l)
        [ $found -eq 0 ] || error "Write: zero length component still present"
 
        flg_opts="--comp-flags init"
-       found=$($LFS find --comp-start 10M -E 138M $flg_opts $comp_file | wc -l)
+       $LFS find --comp-start 10M -E +137M $flg_opts $comp_file
+       found=$($LFS find --comp-start 10M -E +137M $flg_opts $comp_file |wc -l)
        [ $found -eq 1 ] || error "Write: second component not found"
 
        flg_opts="--comp-flags extension"
-       found=$($LFS find --comp-start 138M -E EOF $flg_opts $comp_file | wc -l)
+       found=$($LFS find --comp-start +137M -E EOF $flg_opts $comp_file |wc -l)
        [ $found -eq 1 ] || error "Write: third component not found"
 
        fail $SINGLEMDS
@@ -1737,11 +1742,11 @@ test_20b() {
        [ $found -eq 0 ] || error "Failover: 0-length component still present"
 
        flg_opts="--comp-flags init"
-       found=$($LFS find --comp-start 10M -E 138M $flg_opts $comp_file | wc -l)
+       found=$($LFS find --comp-start 10M -E +137M $flg_opts $comp_file |wc -l)
        [ $found -eq 1 ] || error "Failover: second component not found"
 
        flg_opts="--comp-flags extension"
-       found=$($LFS find --comp-start 138M -E EOF $flg_opts $comp_file | wc -l)
+       found=$($LFS find --comp-start +137M -E EOF $flg_opts $comp_file |wc -l)
        [ $found -eq 1 ] || error "Failover: third component not found"
 
        sel_layout_sanity $comp_file 3
@@ -2460,7 +2465,7 @@ test_24a() {
 
        local file=$DIR/$tfile
 
-       $LFS setstripe -E 1m -c1 -o0 -E eof -c2 -o1,2 $file ||
+       $LFS setstripe -E 1m -c1 -o0 -E eof -c2 -S 1M -o1,2 $file ||
                error "setstripe on $file"
 
        dd if=/dev/zero of=$file bs=1M count=3 || error "dd failed for $file"