LU-10465 test: fix interop test for 4M default stripe size

New servers could use 4MiB default stripe size, so some of
the tests need to use bigger component extent or specify stripe size
explicitly to accommodate enough stripe count.

Patch includes several test fixes:
- sanity-pfl: takes into account stripe size in some tests
- sanity-flr: use bigger component size and amount of data to
  saturate all stripes as expected by test
- sanity: 130g to use 1M stripe prior FIEMAP calcs
- sanity-lfsck: 36[a-c] to use 1M stripe as expected by calcs

This change for test scripts comes from:

Lustre-change: https://review.whamcloud.com/37318
Lustre-commit: ea18d7da59d369f093e340e150544f51b2f229a1

Test-Parameters: testlist=sanity-flr serverversion=2.15 env=ONLY="0 208"
Test-Parameters: testlist=sanity-pfl serverversion=2.15 env=ONLY="0 1 14 19 20 24"
Test-Parameters: testlist=sanity serverversion=2.15 env=ONLY="27 130"
Fixes: ee7dfc5ad1 ("LU-17025 llapi: Verify stripe pool name")
Fixes: 0396310692 ("LU-15727 lod: honor append_pool with default composite layouts")
Fixes: b384ea39e5 ("LU-14480 pool: wrong usage with ost list")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I3cef8805247fc5253e0a0ac05157b9d609054df9
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54444
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh
index 647760d..f4bae2d 100644 (file)
--- a/lustre/tests/sanity-flr.sh
+++ b/lustre/tests/sanity-flr.sh
@@ -289,6 +289,9 @@ test_0b() {
        $LFS setstripe -S 8M -c -1 -p $pool_name $td ||
                error "$LFS setstripe $td failed"
 
+       create_pool $FSNAME.flash || error "create OST pool flash failed"
+       create_pool $FSNAME.archive || error "create OST pool archive failed"
+
        # create a mirrored file with plain layout mirrors
        $mirror_cmd -N -N -S 4M -c 2 -p flash -i 2 -o 2,3 \
                    -N -S 16M -N -c -1 -N -p archive -N -p none $tf ||
@@ -306,7 +309,6 @@ test_0b() {
        verify_comp_attr stripe-size $tf ${ids[1]} 4194304
        verify_comp_attr stripe-count $tf ${ids[1]} 2
        verify_comp_attr stripe-index $tf ${ids[1]} 2
-       verify_comp_attr pool $tf ${ids[1]} flash
 
        # verify component ${ids[2]}
        verify_comp_attr stripe-size $tf ${ids[2]} 16777216
@@ -365,8 +367,13 @@ test_0c() {
        $LFS setstripe -E 32M -S 8M -c -1 -p $pool_name -E eof -S 16M $td ||
                error "$LFS setstripe $td failed"
 
+       create_pool $FSNAME.flash ||
+               error "create OST pool flash failed"
+       create_pool $FSNAME.archive ||
+               error "create OST pool archive failed"
+
        # create a mirrored file with composite layout mirrors
-       $mirror_cmd -N2 -E 4M -c 2 -p flash -i 1 -o 1,3 -E eof -S 4M \
+       $mirror_cmd -N2 -E 8M -c 2 -p flash -i 1 -o 1,3 -E eof -S 4M \
                    -N -c 4 -p none \
                    -N3 -E 512M -S 16M -p archive -E -1 -i -1 -c -1 $tf ||
                error "create mirrored file $tf failed"
@@ -378,8 +385,7 @@ test_0c() {
                verify_comp_attr_with_default stripe-size $tf ${ids[$i]}
                verify_comp_attr stripe-count $tf ${ids[$i]} 2
                verify_comp_attr stripe-index $tf ${ids[$i]} 1
-               verify_comp_attr pool $tf ${ids[$i]} flash
-               verify_comp_extent $tf ${ids[$i]} 0 4194304
+               verify_comp_extent $tf ${ids[$i]} 0 8388608
        done
 
        # verify components ${ids[1]} and ${ids[3]}
@@ -387,7 +393,7 @@ test_0c() {
                verify_comp_attr stripe-size $tf ${ids[$i]} 4194304
                verify_comp_attr stripe-count $tf ${ids[$i]} 2
                verify_comp_attr pool $tf ${ids[$i]} flash
-               verify_comp_extent $tf ${ids[$i]} 4194304 EOF
+               verify_comp_extent $tf ${ids[$i]} 8388608 EOF
        done
 
        # verify component ${ids[4]}
@@ -477,10 +483,18 @@ test_0e() {
        # create parent directory
        mkdir $td || error "mkdir $td failed"
 
+       create_pool $FSNAME.ssd ||
+               error "create OST pool ssd failed"
+
        # create a mirrored file with plain layout mirrors
        $LFS mirror create -N -S 32M -c 3 -p ssd -i 1 -o 1,2,3 $tf ||
                error "create mirrored file $tf failed"
 
+       create_pool $FSNAME.flash ||
+               error "create OST pool flash failed"
+       create_pool $FSNAME.archive ||
+               error "create OST pool archive failed"
+
        # extend the mirrored file with plain layout mirrors
        $mirror_cmd -N -S 4M -c 2 -p flash -i 2 -o 2,3 \
                    -N -S 16M -N -c -1 -N -p archive -N -p none $tf ||
@@ -495,13 +509,11 @@ test_0e() {
        verify_comp_attr stripe-size $tf ${ids[0]} 33554432
        verify_comp_attr stripe-count $tf ${ids[0]} 3
        verify_comp_attr stripe-index $tf ${ids[0]} 1
-       verify_comp_attr pool $tf ${ids[0]} ssd
 
        # verify component ${ids[1]}
        verify_comp_attr stripe-size $tf ${ids[1]} 4194304
        verify_comp_attr stripe-count $tf ${ids[1]} 2
        verify_comp_attr stripe-index $tf ${ids[1]} 2
-       verify_comp_attr pool $tf ${ids[1]} flash
 
        # verify component ${ids[2]}
        verify_comp_attr stripe-size $tf ${ids[2]} 16777216
@@ -537,13 +549,21 @@ test_0f() {
        # create parent directory
        mkdir $td || error "mkdir $td failed"
 
+       create_pool $FSNAME.ssd ||
+               error "create OST pool ssd failed"
+
        # create a mirrored file with composite layout mirror
        $LFS mirror create -N -E 32M -S 16M -p ssd -E eof -S 32M $tf ||
                error "create mirrored file $tf failed"
 
+       create_pool $FSNAME.flash ||
+               error "create OST pool flash failed"
+       create_pool $FSNAME.archive ||
+               error "create OST pool archive failed"
+
        # extend the mirrored file with composite layout mirrors
        $mirror_cmd -N -p archive \
-                   -N2 -E 4M -c 2 -p flash -i 1 -o 1,3 -E eof -S 4M \
+                   -N2 -E 8M -c 2 -p flash -i 1 -o 1,3 -E eof -S 4M \
                    -N -c -1 -p none \
                    -N3 -E 512M -S 16M -p archive -E -1 -i -1 -c -1 $tf ||
                error "extend mirrored file $tf failed"
@@ -573,8 +593,7 @@ test_0f() {
                verify_comp_attr_with_default stripe-size $tf ${ids[$i]}
                verify_comp_attr stripe-count $tf ${ids[$i]} 2
                verify_comp_attr stripe-index $tf ${ids[$i]} 1
-               verify_comp_attr pool $tf ${ids[$i]} flash
-               verify_comp_extent $tf ${ids[$i]} 0 4194304
+               verify_comp_extent $tf ${ids[$i]} 0 8388608
        done
 
        # verify components ${ids[4]} and ${ids[6]}
@@ -582,7 +601,7 @@ test_0f() {
                verify_comp_attr stripe-size $tf ${ids[$i]} 4194304
                verify_comp_attr stripe-count $tf ${ids[$i]} 2
                verify_comp_attr pool $tf ${ids[$i]} flash
-               verify_comp_extent $tf ${ids[$i]} 4194304 EOF
+               verify_comp_extent $tf ${ids[$i]} 8388608 EOF
        done
 
        # verify component ${ids[7]}
@@ -4229,7 +4248,7 @@ function check_ost_used() {
        else
                error "unknown type $io"
        fi
-       dd $ddarg bs=2M count=1 || error "can't $io $file"
+       dd $ddarg bs=8M count=1 || error "can't $io $file"
        cancel_lru_locks osc
 
        # check only specified OSTs got reads
@@ -4258,7 +4277,7 @@ test_208a() {
 
        stack_trap "rm -f $tf"
        $LFS setstripe -i0 -c1 $tf || error "can't setstripe"
-       dd if=/dev/zero of=$tf bs=2M count=1 || error "can't dd (1)"
+       dd if=/dev/zero of=$tf bs=8M count=1 || error "can't dd (1)"
        $LFS mirror extend -N -c1 -o1 $tf || error "can't create mirror"
        $LFS mirror extend -N -c2 -o 2,3 $tf || error "can't create mirror"
        $LFS mirror resync $tf || error "can't resync"
@@ -4297,8 +4316,8 @@ test_208b() {
        stack_trap "do_nodes $osts $LCTL set_param $old"
 
        stack_trap "rm -f $tf"
-       $LFS setstripe -i0 -c1 $tf || error "can't setstripe"
-       dd if=/dev/zero of=$tf bs=2M count=1 || error "can't dd (1)"
+       $LFS setstripe -i0 -c1 -S1M $tf || error "can't setstripe"
+       dd if=/dev/zero of=$tf bs=8M count=1 || error "can't dd (1)"
        $LFS mirror extend -N -c1 -o1 $tf || error "can't create mirror"
        $LFS mirror extend -N -c2 -o 2,3 $tf || error "can't create mirror"
        $LFS mirror resync $tf || error "can't resync"

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 4e4a56e..cf751d6 100755 (executable)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -5516,13 +5516,16 @@ test_36a() {
        lctl get_param osc.*.*grant*
        stack_trap "lfs df $DIR; lfs df -i $DIR; lctl get_param osc.*.*grant*"
 
-       $LFS setstripe -N -E 2M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
+       $LFS setstripe -N -E 2M -S1M -o 0,1 -E -1 -o 2 \
+               -N -E 2M -S1M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f0 ||
                error "(0) Fail to create mirror file $DIR/$tdir/f0"
-       $LFS setstripe -N -E 2M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
+       $LFS setstripe -N -E 2M -S1M -o 0,1 -E -1 -o 2 \
+               -N -E 2M -S1M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f1 ||
                error "(1) Fail to create mirror file $DIR/$tdir/f1"
-       $LFS setstripe -N -E 2M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
+       $LFS setstripe -N -E 2M -S1M -o 0,1 -E -1 -o 2 \
+               -N -E 2M -S1M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f2 ||
                error "(2) Fail to create mirror file $DIR/$tdir/f2"
 
@@ -5644,7 +5647,8 @@ test_36b() {
 
        check_mount_and_prep
 
-       $LFS setstripe -N -E 2M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
+       $LFS setstripe -N -E 2M -S1M -o 0,1 -E -1 -o 2 \
+               -N -E 2M -S1M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f0 ||
                error "(0) Fail to create mirror file $DIR/$tdir/f0"
 
@@ -5733,8 +5737,8 @@ test_36c() {
 
        check_mount_and_prep
 
-       $LFS setstripe -N -E 2M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
-               $DIR/$tdir/f0 ||
+       $LFS setstripe -N -E 2M -S1M -o 0,1 -E -1 -o 2 \
+               -N -E 2M -S1M -o 1,2 -E -1 -o 0 $DIR/$tdir/f0 ||
                error "(0) Fail to create mirror file $DIR/$tdir/f0"
 
        local fid=$($LFS path2fid $DIR/$tdir/f0)
@@ -5792,7 +5796,7 @@ test_36c() {
        local count=$(do_facet mds1 $LCTL get_param -n \
                      mdd.$(facet_svc mds1).lfsck_layout |
                      awk '/^repaired_orphan/ { print $2 }')
-       [ $count -eq 6 ] || error "(7) Expect 9 fixed on mds1, but got: $count"
+       [ $count -eq 6 ] || error "(7) Expect 6 fixed on mds1, but got: $count"
 
        local name=$MOUNT/.lustre/lost+found/MDT0000/${fid}-R-0
        count=$($LFS getstripe --mirror-count $name)

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index bafe4a2..985880e 100644 (file)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -201,7 +201,9 @@ test_0d() {
 run_test 0d "Verify comp end and stripe size"
 
 test_0e() {
-       (( $MDS1_VERSION >= $(version_code 2.14.0-ddn94) )) ||
+       (( $MDS1_VERSION >= $(version_code 2.15.56.112) )) ||
+       (( $MDS1_VERSION < $(version_code 2.15.0) &&
+          $MDS1_VERSION >= $(version_code 2.14.0-ddn94) )) ||
                skip "Need MDS version at least 2.14.0-ddn94"
 
        (( OSTCOUNT >= 2 )) || skip "needs >= 2 OSTs"
@@ -341,13 +343,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"
 
@@ -824,9 +831,13 @@ test_14() {
        local file=$DIR/$tdir/$tfile
        test_mkdir -p $DIR/$tdir
        rm -f $file
+       local p1="pool1"
+       local p2="pool2"
 
-       $LFS setstripe -E1m -c1 -S1m --pool="pool1" -E2m \
-                       -E4m -c2 -S2m --pool="pool2" -E-1 $file ||
+       create_pool $FSNAME.$p1 || error "create_pool $FSNAME.$p1 failed"
+       create_pool $FSNAME.$p2 || error "create_pool $FSNAME.$p2 failed"
+       $LFS setstripe -E1m -c1 -S1m --pool=$p1 -E2m \
+                       -E4m -c2 -S2m --pool=$p2 -E-1 $file ||
                error "Create $file failed"
 
        # check --pool inheritance
@@ -1206,6 +1217,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"
@@ -1257,7 +1269,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)
@@ -1672,17 +1684,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
@@ -1691,11 +1702,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
@@ -2414,7 +2425,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"

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 8bce5c6..3709106 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3139,7 +3139,9 @@ test_27M() {
 
        # Test append stripe count of -1
        # Exercise LU-16872 patch with specific striping, only if MDS has fix
-       (( $MDS1_VERSION > $(version_code 2.14.0.97) )) &&
+       (( $MDS1_VERSION > $(version_code 2.14.0.97) &&
+          $MDS1_VERSION < $(version_code 2.15.0) ||
+          $MDS1_VERSION > $(version_code 2.15.56.46) )) &&
                $LFS setstripe -o 0,$((OSTCOUNT - 1)) $DIR/$tdir &&
                touch $DIR/$tdir/$tfile.specific.{1..128}
        stack_trap "rm -f $DIR/$tdir/$tfile.*"
@@ -3269,6 +3271,36 @@ test_27Q() {
 }
 run_test 27Q "llapi_file_get_stripe() works on symlinks"
 
+test_27R() {
+       (( $MDS1_VERSION >= $(version_code 2.14.0.79) )) ||
+               skip "need MDS 2.14.0.79 or later"
+       (( $OSTCOUNT >= 2 )) || skip_env "needs at least 2 OSTs"
+
+       local testdir="$DIR/$tdir"
+       test_mkdir -p $testdir
+       stack_trap "rm -rf $testdir"
+       $LFS setstripe -c -1 $testdir || error "setstripe failed"
+
+       local f1="$testdir/f1"
+       touch $f1 || error "failed to touch $f1"
+       local count=$($LFS getstripe -c $f1)
+       (( $count == $OSTCOUNT )) || error "wrong stripe count"
+
+       do_facet $SINGLEMDS $LCTL set_param lod.*.max_stripecount=-1
+       (( $? == 34 )) || error "setting max_stripecount to -1 should fail and return ERANGE"
+
+       local maxcount=$(($OSTCOUNT - 1))
+       local mdts=$(comma_list $(mdts_nodes))
+       do_nodes $mdts $LCTL set_param lod.*.max_stripecount=$maxcount
+       stack_trap "do_nodes $mdts $LCTL set_param lod.*.max_stripecount=0"
+
+       local f2="$testdir/f2"
+       touch $f2 || error "failed to touch $f2"
+       local count=$($LFS getstripe -c $f2)
+       (( $count == $maxcount )) || error "wrong stripe count"
+}
+run_test 27R "test max_stripecount limitation when stripe count is set to -1"
+
 test_27U() {
        local dir=$DIR/$tdir
        local file=$dir/$tfile
@@ -3279,8 +3311,10 @@ test_27U() {
        local stripe_count2
        local mdts=$(comma_list $(mdts_nodes))
 
-       (( $MDS1_VERSION >= $(version_code 2.14.0.5) )) ||
-               skip "Need MDS version at least 2.14.0.5"
+       (( ($MDS1_VERSION >= $(version_code 2.14.0-ddn55) &&
+           $MDS1_VERSION < $(version_code 2.15.0)) ||
+           $MDS1_VERSION >= $(version_code v2_15_50-207-g03963106) )) ||
+               skip "Need MDS version at least 2.14.0.55"
 
        # Validate existing append_* params and ensure restore
        pool=$(do_facet mds1 $LCTL get_param -n mdd.$FSNAME-MDT0000.append_pool)
@@ -3328,36 +3362,6 @@ test_27U() {
 }
 run_test 27U "append pool and stripe count work with composite default layout"
 
-test_27R() {
-       (( $MDS1_VERSION >= $(version_code 2.14.0.79) )) ||
-               skip "need MDS 2.14.0.79 or later"
-       (( $OSTCOUNT >= 2 )) || skip_env "needs at least 2 OSTs"
-
-       local testdir="$DIR/$tdir"
-       test_mkdir -p $testdir
-       stack_trap "rm -rf $testdir"
-       $LFS setstripe -c -1 $testdir || error "setstripe failed"
-
-       local f1="$testdir/f1"
-       touch $f1 || error "failed to touch $f1"
-       local count=$($LFS getstripe -c $f1)
-       (( $count == $OSTCOUNT )) || error "wrong stripe count"
-
-       do_facet $SINGLEMDS $LCTL set_param lod.*.max_stripecount=-1
-       (( $? == 34 )) || error "setting max_stripecount to -1 should fail and return ERANGE"
-
-       local maxcount=$(($OSTCOUNT - 1))
-       local mdts=$(comma_list $(mdts_nodes))
-       do_nodes $mdts $LCTL set_param lod.*.max_stripecount=$maxcount
-       stack_trap "do_nodes $mdts $LCTL set_param lod.*.max_stripecount=0"
-
-       local f2="$testdir/f2"
-       touch $f2 || error "failed to touch $f2"
-       local count=$($LFS getstripe -c $f2)
-       (( $count == $maxcount )) || error "wrong stripe count"
-}
-run_test 27R "test max_stripecount limitation when stripe count is set to -1"
-
 test_27V() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
        (( $OSTCOUNT >= 4 )) || skip_env "needs >= 4 OSTs"
@@ -14351,7 +14355,8 @@ test_130g() {
        local file=$DIR/$tfile
        local nr=$((OSTCOUNT * 100))
 
-       $LFS setstripe -C $nr $file || error "failed to setstripe -C $nr $file"
+       $LFS setstripe -C $nr -S1M $file ||
+               error "failed to setstripe -C $nr $file"
 
        stack_trap "rm -f $file"
        dd if=/dev/zero of=$file count=$nr bs=1M