LU-11673 tests: quote argument of -n and test fix

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

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index dfdd83f..83ac42b 100644 (file)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -528,7 +528,8 @@ test_11() {
        [[ -n $f4 ]] && error "1: 4th component instantiated"
 
        # the first 2 components instantiated
-       $TRUNCATE $comp_file $((1024*1024*1+1))
+       # Truncate to exact start of new component - LU-12586
+       $TRUNCATE $comp_file $((1024*1024*1))
 
        f2=$($LFS getstripe -I2 $comp_file | grep "l_fid")
        [[ -z $f2 ]] && error "2: 2nd component uninstantiated"
@@ -538,7 +539,7 @@ test_11() {
        [[ -n $f4 ]] && error "2: 4th component instantiated"
 
        # the first 3 components instantiated
-       $TRUNCATE $comp_file $((1024*1024*3))
+       $TRUNCATE $comp_file $((1024*1024*3 - 1))
        $TRUNCATE $comp_file $((1024*1024*1+1))
 
        f2=$($LFS getstripe -I2 $comp_file | grep "l_fid")
@@ -674,7 +675,7 @@ test_15() {
        $LFS setstripe -E 1M -S 1M -E 10M -E eof $parent/f1 || error "create f1"
        $LFS setstripe -E 4M -E 20M -E eof $parent/f2 || error "create f2"
        test_mkdir $parent/subdir
-       $LFS setstripe -E 6M -S 1M -E 30M -E eof $parent/subdir ||
+       $LFS setstripe -E 6M -S 1M -c1 -E 30M -c4 -E eof -c -1 $parent/subdir ||
                error "setstripe to subdir"
        $LFS setstripe -E 8M -E eof $parent/subdir/f3 || error "create f3"
        $LFS setstripe -c 1 $parent/subdir/f4 || error "create f4"
@@ -724,6 +725,15 @@ test_15() {
        found=$($LFS find $ext_opts ! $cnt_opts $flg_opts $parent | wc -l)
        [ $found -eq 2 ] ||
                error "start-1M, end+5M, !count+2, flag=init, $found != 2"
+
+       # check last component stripe count
+       if [ $OSTCOUNT -gt 1 ]; then
+               touch $parent/subdir/f5
+               $TRUNCATE $parent/subdir/f5 $((32*1024*1024))
+               found=$($LFS find $parent/subdir -c $OSTCOUNT)
+               [[ "$found" == "$parent/subdir/f5" ]] ||
+                       error "got '$found' with stripe_count=$OSTCOUNT, not f5"
+       fi
 }
 run_test 15 "Verify component options for lfs find"
 
@@ -974,7 +984,52 @@ test19_io_base() {
 
        flg_opts="--comp-flags extension"
        found=$($LFS find --comp-start 128M -E EOF $flg_opts $comp_file | wc -l)
-       [ $found -eq 1 ] || error "Write: Second component not found"
+       [ $found -eq 1 ] || error "Write: second component not found"
+
+       found=$($LFS find -z 64M $comp_file | wc -l)
+       [ $found -eq 1 ] || error "component not found by ext size"
+
+       found=$($LFS find --extension-size +63M $comp_file | wc -l)
+       [ $found -eq 1 ] || error "component not found by +ext size"
+
+       found=$($LFS find --ext-size -65M $comp_file | wc -l)
+       [ $found -eq 1 ] || error "component not found by -ext size"
+
+       found=$($LFS find -z 65M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by wrong ext size"
+
+       found=$($LFS find -z +65M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by wrong +ext size"
+
+       found=$($LFS find -z -63M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by wrong -ext size"
+
+       found=$($LFS find ! -z 64M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by negation of ext size"
+
+       found=$($LFS find ! -z +63M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by negation of +ext size"
+
+       found=$($LFS find ! -z -65M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by negation of -ext size"
+
+       found=$($LFS find ! -z 65M $comp_file | wc -l)
+       [ $found -eq 1 ] ||
+               error "component not found by negation of wrong ext size"
+
+       found=$($LFS find ! -z +65M $comp_file | wc -l)
+       [ $found -eq 1 ] ||
+               error "component not found by negation of wrong +ext size"
+
+       found=$($LFS find ! -z -63M $comp_file | wc -l)
+       [ $found -eq 1 ] ||
+               error "component not found by negation of wrong -ext size"
+
+       found=$($LFS find -S +1M $comp_file | wc -l)
+       [ $found -eq 0 ] || error "component found by wrong +stripe size"
+
+       found=$($LFS find -c 1 $comp_file | wc -l)
+       [ $found -eq 1 ] || error "component not found by stripe count"
 
        small_write $comp_file $rw_len || error "Verify RW failed"
 
@@ -1210,6 +1265,82 @@ test_19f() {
 }
 run_test 19f "Rejection of invalid layouts"
 
+test_19g() {
+       [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+       [ $(lustre_version_code $SINGLEMDS) -lt $(version_code $SEL_VER) ] &&
+               skip "skipped for lustre < $SEL_VER"
+
+       local file1=$DIR/${tfile}-1
+       local file2=$DIR/${tfile}-2
+
+       test_mkdir -p $DIR/$tdir
+       multiop $file1 oO_RDWR:O_CREAT:O_LOV_DELAY_CREATE:c ||
+               error "create failed $file1"
+       multiop $file2 oO_RDWR:O_CREAT:O_LOV_DELAY_CREATE:c ||
+               error "create failed $file2"
+
+       $LFS setstripe --component-add -E 1G -c 1 $file1 ||
+               error "comp-add [0,1G] failed $file1"
+       $LFS setstripe --component-add -E 512M -z 128M $file1 &&
+               error "comp-add [1G,1G],SEL[1G,512M] succeded $file1"
+       $LFS setstripe --component-add -E 10G -z 128M $file1 ||
+               error "comp-add [1G,1G],SEL[1G,10G] failed $file1"
+       $LFS setstripe --component-add -E -1 $file1 ||
+               error "comp-add [10G,-1] failed $file1"
+
+       $LFS setstripe --component-add -E 1G -z 32M -c 1 $file2 &&
+               error "comp-add with smal ext size succeeded $file1"
+       $LFS setstripe --component-add -E 1G -z 100M -c 1 $file2 &&
+               error "comp-add with not aligned ext size succeeded $file1"
+       $LFS setstripe --component-add -E 1G -z 128M -c 1 $file2 ||
+               error "comp-add [0,128M],SEL[128M,1G] failed $file1"
+       $LFS setstripe --component-add -E 10G $file2 ||
+               error "comp-add [1G,10G] failed $file1"
+       $LFS setstripe --component-add -E -1 -z 128M -c 1 $file2 ||
+               error "comp-add [10G,10G],SEL[10G,-1] failed $file1"
+       $LFS setstripe --component-add -E -1 -z 128M -c 1 $file2 &&
+               error "repeated comp-add [10G,10G],SEL[10G,-1] succeeded $file1"
+
+       $LFS getstripe $file1
+       flg_opts="--comp-flags init"
+       found=$($LFS find --comp-start 0 -E 1G $flg_opts $file1 | wc -l)
+       [ $found -eq 1 ] || error "First component not found $file1"
+
+       flg_opts="--comp-flags ^init"
+       found=$($LFS find --comp-start 1G -E 1G $flg_opts $file1 | wc -l)
+       [ $found -eq 1 ] || error "Second component not found $file1"
+
+       flg_opts="--comp-flags ^init,extension"
+       found=$($LFS find --comp-start 1G -E 10G $flg_opts $file1 | wc -l)
+       [ $found -eq 1 ] || error "Third component not found $file1"
+
+       flg_opts="--comp-flags ^init"
+       found=$($LFS find --comp-start 10G -E EOF $flg_opts $file1 | wc -l)
+       [ $found -eq 1 ] || error "Fourth component not found $file1"
+
+       $LFS getstripe $file2
+       flg_opts="--comp-flags init"
+       found=$($LFS find --comp-start 0 -E 128M $flg_opts $file2 | wc -l)
+       [ $found -eq 1 ] || error "First component not found $file2"
+
+       flg_opts="--comp-flags extension"
+       found=$($LFS find --comp-start 128M -E 1G $flg_opts $file2 | wc -l)
+       [ $found -eq 1 ] || error "Second component not found $file2"
+
+       flg_opts="--comp-flags ^init"
+       found=$($LFS find --comp-start 1G -E 10G $flg_opts $file2 | wc -l)
+       [ $found -eq 1 ] || error "Third component not found $file2"
+
+       flg_opts="--comp-flags ^init"
+       found=$($LFS find --comp-start 10G -E 10G $flg_opts $file2 | wc -l)
+       [ $found -eq 1 ] || error "Fourth component not found $file2"
+
+       flg_opts="--comp-flags ^init,extension"
+       found=$($LFS find --comp-start 10G -E EOF $flg_opts $file2 | wc -l)
+       [ $found -eq 1 ] || error "Fifth component not found $file2"
+}
+run_test 19g "component-add behaviour"
+
 # Test out of space behavior
 test_20a() {
        [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return