LU-11667 tests: Fix sanity test 317 for 64K PAGE_SIZE OST

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ccdda90..73e68e8 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -59,8 +59,8 @@ fi
 if [[ $(uname -m) = aarch64 ]]; then
        # bug number:    LU-11596
        ALWAYS_EXCEPT+=" $GRANT_CHECK_LIST"
-       # bug number:    LU-11671 LU-11667
-       ALWAYS_EXCEPT+=" 45       317"
+       # bug number:    LU-11671
+       ALWAYS_EXCEPT+=" 45"
        # bug number:    LU-14067 LU-14067
        ALWAYS_EXCEPT+=" 400a     400b"
 fi
@@ -8873,6 +8873,60 @@ test_64g() {
 }
 run_test 64g "grant shrink on MDT"
 
+test_64h() {
+       local instance=$($LFS getname -i $DIR)
+       local osc_tgt="$FSNAME-OST0000-osc-$instance"
+       local num_exps=$(do_facet ost1 \
+           $LCTL get_param -n obdfilter.*OST0000*.num_exports)
+       local max_brw_size=$(import_param $osc_tgt max_brw_size)
+       local avail=$($LCTL get_param -n osc.*OST0000-osc-$instance.kbytesavail)
+       local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
+
+       # 10MiB is for file to be written, max_brw_size * 16 *
+       # num_exps is space reserve so that tgt_grant_shrink() decided
+       # to not shrink
+       local expect=$((max_brw_size * 16 * num_exps + 10 * 1048576))
+       (( avail * 1024 < expect )) &&
+               skip "need $expect bytes on ost1, have $(( avail * 1024 )) only"
+
+       save_lustre_params client "osc.*OST0000*.grant_shrink" > $p
+       save_lustre_params client "osc.*OST0000*.grant_shrink_interval" >> $p
+       stack_trap "restore_lustre_params < $p; rm -f $save" EXIT
+       $LCTL set_param osc.*OST0000*.grant_shrink=1
+       $LCTL set_param osc.*OST0000*.grant_shrink_interval=10
+
+       $LFS setstripe -c 1 -i 0 $DIR/$tfile
+       dd if=/dev/zero of=$DIR/$tfile bs=1M count=10 oflag=sync
+
+       # drop cache so that coming read would do rpc
+       cancel_lru_locks osc
+
+       # shrink interval is set to 10, pause for 7 seconds so that
+       # grant thread did not wake up yet but coming read entered
+       # shrink mode for rpc (osc_should_shrink_grant())
+       sleep 7
+
+       declare -a cur_grant_bytes
+       declare -a tot_granted
+       cur_grant_bytes[0]=$($LCTL get_param -n osc.*OST0000*.cur_grant_bytes)
+       tot_granted[0]=$(do_facet ost1 \
+           $LCTL get_param -n obdfilter.*OST0000*.tot_granted)
+
+       dd if=$DIR/$tfile bs=4K count=1 of=/dev/null
+
+       cur_grant_bytes[1]=$($LCTL get_param -n osc.*OST0000*.cur_grant_bytes)
+       tot_granted[1]=$(do_facet ost1 \
+           $LCTL get_param -n obdfilter.*OST0000*.tot_granted)
+
+       # grant change should be equal on both sides
+       (( cur_grant_bytes[0] - cur_grant_bytes[1] ==
+               tot_granted[0] - tot_granted[1])) ||
+               error "grant change mismatch, "                                \
+                       "server: ${tot_granted[0]} to ${tot_granted[1]}, "     \
+                       "client: ${cur_grant_bytes[0]} to ${cur_grant_bytes[1]}"
+}
+run_test 64h "grant shrink on read"
+
 # bug 1414 - set/get directories' stripe info
 test_65a() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
@@ -21142,18 +21196,20 @@ run_test 253 "Check object allocation limit"
 test_254() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
        remote_mds_nodsh && skip "remote MDS with nodsh"
-       do_facet $SINGLEMDS $LCTL get_param -n mdd.$MDT0.changelog_size ||
+
+       local mdt=$(facet_svc $SINGLEMDS)
+
+       do_facet $SINGLEMDS $LCTL get_param -n mdd.$mdt.changelog_size ||
                skip "MDS does not support changelog_size"
 
        local cl_user
-       local MDT0=$(facet_svc $SINGLEMDS)
 
        changelog_register || error "changelog_register failed"
 
        changelog_clear 0 || error "changelog_clear failed"
 
        local size1=$(do_facet $SINGLEMDS \
-                     $LCTL get_param -n mdd.$MDT0.changelog_size)
+                     $LCTL get_param -n mdd.$mdt.changelog_size)
        echo "Changelog size $size1"
 
        rm -rf $DIR/$tdir
@@ -21168,7 +21224,7 @@ test_254() {
        rm $DIR/$tdir/pics/desktop.jpg
 
        local size2=$(do_facet $SINGLEMDS \
-                     $LCTL get_param -n mdd.$MDT0.changelog_size)
+                     $LCTL get_param -n mdd.$mdt.changelog_size)
        echo "Changelog size after work $size2"
 
        (( $size2 > $size1 )) ||
@@ -23835,19 +23891,19 @@ test_317() {
 
        #
        # sparse file test
-       # Create file with a hole and write actual two blocks. Block count
-       # must be 16.
+       # Create file with a hole and write actual 65536 bytes which aligned
+       # with 4K and 64K PAGE_SIZE. Block count must be 128.
        #
-       dd if=/dev/zero of=$DIR/$tfile bs=$grant_blk_size count=2 seek=5 \
-               conv=fsync || error "Create file : $DIR/$tfile"
-
-       # Calculate the final truncate size.
-       trunc_sz=$(($(stat --format=%s $DIR/$tfile) - (grant_blk_size + 1)))
+       local bs=65536
+       dd if=/dev/zero of=$DIR/$tfile bs=$bs count=1 seek=5 conv=fsync ||
+               error "Create file : $DIR/$tfile"
 
        #
-       # truncate to size $trunc_sz bytes. Strip the last block
-       # The block count must drop to 8
+       # Truncate to size $trunc_sz bytes. Strip tail blocks and leave only 8
+       # blocks. The block count must drop to 8.
        #
+       trunc_sz=$(($(stat --format=%s $DIR/$tfile) - \
+               ((bs - grant_blk_size) + 1)))
        $TRUNCATE $DIR/$tfile $trunc_sz ||
                error "truncate $tfile to $trunc_sz failed"