From 2cd5e0304e88f0a6069f2b42f84348e073a3d273 Mon Sep 17 00:00:00 2001 From: liudanning Date: Wed, 9 Nov 2022 15:57:07 +0800 Subject: [PATCH] kernel_linux_build:modify enhancedf2fs_t testcases suit Signed-off-by: liudanning --- .../testcases/bin/enhancedf2fs01.sh | 22 +++++++---- .../testcases/bin/enhancedf2fs02.sh | 24 +++++------- .../testcases/bin/enhancedf2fs03.sh | 17 ++++---- .../testcases/bin/enhancedf2fs05.sh | 19 ++++----- .../testcases/bin/enhancedf2fs07.sh | 12 ++---- .../testcases/bin/enhancedf2fs08.sh | 12 ++---- .../testcases/bin/enhancedf2fs09.sh | 9 ++--- .../testcases/bin/enhancedf2fs10.sh | 39 ++++++++++++------- .../testcases/bin/enhancedf2fs11.sh | 29 +++++++------- .../testcases/bin/enhancedf2fs12.sh | 21 +++++----- .../testcases/bin/equilibrium_init.sh | 16 +++++--- .../enhancedf2fs_t/testcases/bin/life_init.sh | 6 +-- .../testcases/bin/performance_init.sh | 16 +++++--- .../enhancedf2fs_t/testcases/bin/run_fio.sh | 9 +++-- .../runtest/bin/enhancedf2fs_t_init.sh | 20 ++++++++-- .../runtest/bin/enhancedf2fs_t_uninit.sh | 3 +- 16 files changed, 146 insertions(+), 128 deletions(-) diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh index f7787c6..1a32333 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh @@ -35,8 +35,15 @@ do_test() local ret=0 tst_res TINFO "Start test discard size >= 512 blocks in life mode." + undiscard_num=$(cat /proc/fs/f2fs/${DISK_NAME}/undiscard_info |tr -cd "[0-9]") + if [ "$undiscard_num" != "" ] ;then + tst_res TPASS "Get undiscard info successfully, number is ${undiscard_num}." + else + tst_res TFAIL "Get undiscard info failed." + ret=$(( $ret + 1 )) + fi cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log01.txt & - mkdir /mnt/f2fs_mount/test1 + mkdir $DISK_PATH/test1 if [ $? -eq 0 ]; then tst_res TPASS "Created test1 dir successfully." else @@ -46,10 +53,10 @@ do_test() local i=0 while [ $i -lt 30 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test1/image$i bs=8M count=1 + dd if=/dev/zero of=$DISK_PATH/test1/image$i bs=8M count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test1/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test1/image*[1,3,5,7,9] if [ $? -eq 0 ]; then tst_res TPASS "Deleted successfully." else @@ -62,9 +69,9 @@ do_test() local blklen=$(cat log01.txt | awk 'NR == 1' | awk -F '0x' '{print$3}') if [ $((16#$blklen)) -ge 512 ]; then - tst_res TPASS "blklen >= 512 successfully." + tst_res TPASS "blklen = $blklen >= 512 successfully." else - tst_res TFAIL "blklen >= 512 failed." + tst_res TFAIL "blklen = $blklen >= 512 failed." ret=$(( $ret + 1 )) fi @@ -77,9 +84,8 @@ do_test() do_clean() { - rm log01.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test1/* + rmdir $DISK_PATH/test1/ } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh index 2fd2563..02a3aa7 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh @@ -41,7 +41,7 @@ do_test() cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log02.txt & sh run_fio.sh > run_fio.txt & sleep 60 - mkdir /mnt/f2fs_mount/test2 + mkdir $DISK_PATH/test2 if [ $? -eq 0 ]; then tst_res TPASS "Created test2 dir successfully." else @@ -52,10 +52,10 @@ do_test() local i=0 while [ $i -lt 30 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test2/image$i bs=8M count=1 + dd if=/dev/zero of=$DISK_PATH/test2/image$i bs=8M count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test2/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test2/image*[1,3,5,7,9] if [ $? -eq 0 ]; then tst_res TPASS "Deleted successfully." else @@ -67,7 +67,7 @@ do_test() local second=$(wc -l log02.txt | awk -F ' ' '{print$1}') sleep 90 kill %1 - + sleep 5 local err=$(cat run_fio.txt | grep err | awk -F ':' '{print$3}' | tr -cd "[0-9]") if [ $err -eq 0 ]; then tst_res TPASS "fio read successfully." @@ -78,18 +78,12 @@ do_test() local blklen=$(cat log02.txt | awk 'NR == 1' | awk -F '0x' '{print$3}') if [ $((16#$blklen)) -ge 512 ]; then - tst_res TPASS "blklen >= 512 successfully." + tst_res TPASS "blklen = $blklen >= 512 successfully." else - tst_res TFAIL "blklen >= 512 failed." + tst_res TFAIL "blklen = $blklen >= 512 failed." ret=$(( $ret + 1 )) fi - if [ $(( $second - $first )) -gt 0 ]; then - tst_res TPASS "IO perception test successfully." - else - tst_res TFAIL "IO perception test failed." - ret=$(( $ret + 1 )) - fi if [ $ret -eq 0 ];then tst_res TPASS "life mode, discard is greater than or equal to 512 block \ @@ -102,9 +96,9 @@ do_test() do_clean() { - rm -rf log02.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test2/* + rmdir $DISK_PATH/test2/ + echo "y" | rm log02.txt } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh index 88a46e2..f698712 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh @@ -38,7 +38,7 @@ do_test() cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log03.txt & sleep 60 - mkdir /mnt/f2fs_mount/test3 + mkdir $DISK_PATH/test3 if [ $? -eq 0 ]; then tst_res TPASS "Creation test3 dir successfully." else @@ -49,10 +49,10 @@ do_test() local i=0 while [ $i -lt 50 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test3/image$i bs=512K count=1 + dd if=/dev/zero of=$DISK_PATH/test3/image$i bs=512K count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test3/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test3/image*[1,3,5,7,9] if [ $? -eq 0 ]; then tst_res TPASS "Deleted successfully." else @@ -65,9 +65,9 @@ do_test() local blklen=$(cat log03.txt | awk 'NR == 1' | awk -F '0x' '{print$3}') if [ $((16#$blklen)) -ge 16 ];then - tst_res TPASS "blklen >= 16 successfully." + tst_res TPASS "blklen = $blklen >= 16 successfully." else - tst_res TFAIL "Log printing fail." + tst_res TFAIL "blklen = $blklen >= 16 fail." ret=$(( $ret + 1 )) fi @@ -82,9 +82,10 @@ do_test() do_clean() { - rm -rf log03.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test3/* + rmdir $DISK_PATH/test3/ + echo "y" | rm $DISK_PATH/f2fs_test/* + rmdir $DISK_PATH/f2fs_test/ } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh index f967244..0de0cdf 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh @@ -27,7 +27,7 @@ source performance_init.sh do_setup() { - + } do_test() @@ -37,7 +37,7 @@ do_test() tst_res TINFO "Start test discard size >= 1 block in performance mode." cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log05.txt & - mkdir /mnt/f2fs_mount/test5 + mkdir $DISK_PATH/test5 if [ $? -eq 0 ]; then tst_res TPASS "Creation test5 dir successfully." else @@ -47,10 +47,10 @@ do_test() local i=0 while [ $i -lt 200 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test5/image$i bs=4k count=1 + dd if=/dev/zero of=$DISK_PATH/test5/image$i bs=4k count=1 i=$((i+1)) done - rm -rf /mnt/f2fs_mount/test5/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test5/image*[1,3,5,7,9] if [ $? -eq 0 ]; then tst_res TPASS "Delete successfully." else @@ -62,9 +62,9 @@ do_test() kill %1 local blklen=$(cat log05.txt | awk 'NR == 1' | awk -F '0x' '{print$3}') if [ $((16#$blklen)) -ge 1 ];then - tst_res TPASS "Log printing successfully." + tst_res TPASS "blklen = $blklen >= 1 successfully." else - tst_res TFAIL "Log printing failed." + tst_res TFAIL "blklen = $blklen >= 1 failed." ret=$(( $ret + 1 )) fi @@ -79,9 +79,10 @@ do_test() do_clean() { - rm -rf log05.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test5/* + rmdir $DISK_PATH/test5/ + echo "y" | rm $DISK_PATH/f2fs_test/* + rmdir $DISK_PATH/f2fs_test/ } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh index e0f9167..e96a80d 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh @@ -25,22 +25,20 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + } do_test() { local ret=0 - _ssr_path=/sys/fs/f2fs/loop1 + _ssr_path=/sys/fs/f2fs/${DISK_NAME} tst_res TINFO "Start test hierarchical SSR control interface." if [ $(cat $_ssr_path/hc_enable) == '0' ]; then - tst_res TPASS "default is 0 successfully." + tst_res TPASS "$_ssr_path default is 0 successfully." else - tst_res TFAIL "default not is 0 failed." + tst_res TFAIL "$_ssr_path default not is 0 failed." ret=$(( $ret + 1 )) fi @@ -56,8 +54,6 @@ do_test() do_clean() { echo $temp > $_ssr_path/hc_enable - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh index fec1882..894ae22 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh @@ -25,15 +25,13 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + } do_test() { ret=0 - _ssr_path=/sys/fs/f2fs/loop1 + _ssr_path=/sys/fs/f2fs/${DISK_NAME} tst_res TINFO "Start test hierarchical SSR threshold configuration interface." @@ -70,7 +68,7 @@ do_test() confirm_value() { - local result_out1=$(cat /sys/fs/f2fs/loop1/$1) + local result_out1=$(cat /sys/fs/f2fs/${DISK_NAME}/$1) if [ "$result_out1" == "5242880" ]; then tst_res TPASS "$1 is 5242880 expected." return 0 @@ -82,7 +80,7 @@ confirm_value() confirm_change_value() { - local result_out2=$(cat /sys/fs/f2fs/loop1/$1) + local result_out2=$(cat /sys/fs/f2fs/${DISK_NAME}/$1) if [ "$result_out2" == "6000000" ]; then tst_res TPASS "$1 is 6000000 expected." else @@ -97,8 +95,6 @@ do_clean() echo $init_value2 > $_ssr_path/hc_warm_data_lower_limit echo $init_value3 > $_ssr_path/hc_hot_node_lower_limit echo $init_value4 > $_ssr_path/hc_warm_node_lower_limit - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh index 73d043e..672c852 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh @@ -25,15 +25,13 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + } do_test() { ret=0 - _ssr_path=/sys/fs/f2fs/loop1 + _ssr_path=/sys/fs/f2fs/${DISK_NAME} tst_res TINFO "Start test hierarchical SSR waterline configuration interface." @@ -96,8 +94,7 @@ do_clean() echo $init_value2 > $_ssr_path/hc_warm_data_waterline echo $init_value3 > $_ssr_path/hc_hot_node_waterline echo $init_value4 > $_ssr_path/hc_warm_node_waterline - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh index 10f8ec3..b5dea9e 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh @@ -25,9 +25,7 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + mkdir $DISK_PATH/ } do_test() @@ -38,34 +36,40 @@ do_test() tst_res TINFO "Start test hierarchical SSR recovery function is enabled." local i=0 - while [ $i -lt 32 ] + df -h | grep -w "$DISK_NAME" | awk -F " " '{print $2}' > 1.txt + df -h | grep -w "$DISK_NAME" | awk -F " " '{print $3}' > 2.txt + total_mem=$(sed 's/.$//' 1.txt) + used_mem=$(sed 's/.$//' 2.txt | cut -d '.' -f1) + mid_mem=$(expr $total_mem - 2) + expected_mem=$(expr $mid_mem - $used_mem) + while [ $i -lt $expected_mem ] do - dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1 + dd if=/dev/zero of=$DISK_PATH/image$i bs=1G count=1 i=$(( $i + 1 )) done - mkdir /mnt/f2fs_mount/test10 + mkdir $DISK_PATH/test10 local i=0 while [ $i -lt 5120 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test10/image$i bs=512k count=1 + dd if=/dev/zero of=$DISK_PATH/test10/image$i bs=512k count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test10/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test10/image*[1,3,5,7,9] - echo 1 > /sys/fs/f2fs/loop1/hc_enable + echo 1 > /sys/fs/f2fs/${DISK_NAME}/hc_enable echo 1 > $_sys_path/tracing_on echo 1 > $_sys_path/events/f2fs/f2fs_grading_ssr_allocate/enable cat $_sys_path/trace_pipe | grep ssr >> log10.txt & - mkdir /mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate + mkdir $DISK_PATH/test10/f2fs_grading_ssr_allocate local i=0 while [ $i -lt 200 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate/image$i bs=4k count=1 + dd if=/dev/zero of=$DISK_PATH/test10/f2fs_grading_ssr_allocate/image$i bs=4k count=1 i=$(($i + 1)) done - rm -rf /mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test10/f2fs_grading_ssr_allocate/image*[1,3,5,7,9] sleep 180 kill %1 @@ -82,13 +86,18 @@ do_test() else tst_res TFAIL "The hierarchical SSR recovery function is enabled failed!" fi + + echo "y" | rm 1.txt + echo "y" | rm 2.txt } do_clean() { - rm -rf log10.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test10/f2fs_grading_ssr_allocate/* + rmdir $DISK_PATH/test10/f2fs_grading_ssr_allocate/ + echo "y" | rm $DISK_PATH/test10/* + rmdir $DISK_PATH/test10/ + echo "y" | rm $DISK_PATH/image* } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh index 9c89422..9e51eb7 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh @@ -25,9 +25,7 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + mkdir $DISK_PATH/f2fs_test } do_test() @@ -39,32 +37,32 @@ do_test() local i=0 while [ $i -lt 32 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1 + dd if=/dev/zero of=$DISK_PATH/f2fs_test/image$i bs=512M count=1 i=$(( $i+ 1 )) done - mkdir /mnt/f2fs_mount/test11 + mkdir $DISK_PATH/test11 local i=0 while [ $i -lt 5120 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test11/image$i bs=512k count=1 + dd if=/dev/zero of=$DISK_PATH/test11/image$i bs=512k count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test11/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test11/image*[1,3,5,7,9] - echo 0 > /sys/fs/f2fs/loop1/hc_enable + echo 0 > /sys/fs/f2fs/${DISK_NAME}/hc_enable echo 1 > $_sys_path/tracing_on echo 1 > $_sys_path/events/f2fs/f2fs_grading_ssr_allocate/enable cat $_sys_path/trace_pipe | grep ssr >> log11.txt & - mkdir /mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate + mkdir $DISK_PATH/test11/f2fs_grading_ssr_allocate local i=0 while [ $i -lt 200 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate/image$i bs=4k count=1 + dd if=/dev/zero of=$DISK_PATH/test11/f2fs_grading_ssr_allocate/image$i bs=4k count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/test11/f2fs_grading_ssr_allocate/image*[1,3,5,7,9] sleep 180 kill %1 @@ -85,9 +83,12 @@ do_test() do_clean() { - rm -rf log11.txt - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount + echo "y" | rm $DISK_PATH/test11/f2fs_grading_ssr_allocate/* + rmdir $DISK_PATH/test11/f2fs_grading_ssr_allocate/ + echo "y" | rm $DISK_PATH/test11/* + rmdir $DISK_PATH/test11/ + echo "y" | rm $DISK_PATH/f2fs_test/* + rmdir $DISK_PATH/f2fs_test/ } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh index f80ab28..8630586 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh @@ -25,16 +25,14 @@ source tst_oh.sh do_setup() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + mkdir $DISK_PATH/f2fs_test } do_test() { local ret=0 local _sys_path=/sys/kernel/debug/tracing - temp=$(cat /sys/fs/f2fs/loop1/gc_urgent) + temp=$(cat /sys/fs/f2fs/${DISK_NAME}/gc_urgent) tst_res TINFO "Start test GC function." @@ -45,12 +43,12 @@ do_test() local i=0 while [ $i -lt 512 ] do - dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=1M count=1 + dd if=/dev/zero of=$DISK_PATH/f2fs_test/image$i bs=1M count=1 i=$(( $i + 1 )) done - rm -rf /mnt/f2fs_mount/image*[1,3,5,7,9] + echo "y" | rm $DISK_PATH/f2fs_test/image*[1,3,5,7,9] - echo 1 > /sys/fs/f2fs/loop1/gc_urgent + echo 1 > /sys/fs/f2fs/${DISK_NAME}/gc_urgent sleep 60 kill %1 @@ -69,11 +67,10 @@ do_test() } do_clean() -{ - rm -rf log12.txt - echo $temp > /sys/fs/f2fs/loop1/gc_urgent - losetup -d /dev/block/loop1 - umount /mnt/f2fs_mount +{ + echo $temp > /sys/fs/f2fs/${DISK_NAME}/gc_urgent + echo "y" | rm $DISK_PATH/f2fs_test/* + rmdir $DISK_PATH/f2fs_test } do_setup diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh index 095cd8b..6b50ec8 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh @@ -25,9 +25,7 @@ source tst_oh.sh state_init() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + mkdir $DISK_PATH/f2fs_test } equilibrium_init() @@ -39,9 +37,13 @@ equilibrium_init() local a=$(cat $segs_path | grep segs | awk -F ' ' '{print$3}') local i=0 - while [ $i -lt 32 ] + df -h | grep -w "$DISK_NAME" | awk -F " " '{print $2}' > 1.txt + total_mem=$(sed 's/.$//' 1.txt) + mid_mem=$(expr $total_mem \* 82) + expected_mem=$(expr $mid_mem / 100) + while [ $i -lt $expected_mem ] do - dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1 + dd if=/dev/zero of=$DISK_PATH/f2fs_test/image$i bs=1G count=1 i=$(( $i + 1 )) done @@ -61,7 +63,7 @@ equilibrium_init() fi sleep 60 - if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '1' ];then + if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '1' ];then tst_res TPASS "equilibrium model successfully." else tst_res TFAIL "equilibrium model failed." @@ -82,6 +84,8 @@ equilibrium_init() else tst_res TFAIL "equilibrium_init failed!" fi + + echo "y" | rm 1.txt } state_init diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh index 72ce03a..30757a2 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh @@ -25,9 +25,7 @@ source tst_oh.sh state_init() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + } life_init() @@ -51,7 +49,7 @@ life_init() ret=$(( $ret + 1 )) fi - if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '0' ];then + if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '0' ];then tst_res TPASS "life model successfully." else tst_res TFAIL "life model failed." diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh index 841d136..f7bfb30 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh @@ -25,9 +25,7 @@ source tst_oh.sh state_init() { - mkfs.f2fs -d1 -t1 -O quota $IMG_FILE - losetup /dev/block/loop1 $IMG_FILE - mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/ + mkdir $DISK_PATH/f2fs_test } performance_init() @@ -39,9 +37,13 @@ performance_init() local a=$(cat $segs_path | grep segs | awk -F ' ' '{print$3}') echo "start Embedded file system $(date +%Y%m%d%H%M%S)...." >> log06.txt local i=0 - while [ $i -lt 37 ] + df -h | grep -w "$DISK_NAME" | awk -F " " '{print $2}' > 1.txt + total_mem=$(sed 's/.$//' 1.txt) + mid_mem=$(expr $total_mem \* 90) + expected_mem=$(expr $mid_mem / 100) + while [ $i -lt $expected_mem ] do - dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1 + dd if=/dev/zero of=$DISK_PATH/f2fs_test/image$i bs=1G count=1 i=$(( $i + 1 )) done echo "end Embedded file system $(date +%Y%m%d%H%M%S)...." >> log06.txt @@ -58,7 +60,7 @@ performance_init() fi sleep 60 - if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '2' ];then + if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '2' ];then tst_res TPASS "performance model successfully." else tst_res TFAIL "performance model failed." @@ -78,6 +80,8 @@ performance_init() else tst_res TFAIL "performance_init failed!" fi + + echo "y" | rm 1.txt } state_init diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh index a9b355f..f517b39 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh @@ -22,10 +22,11 @@ ################################################################################ run_fio() -{ - ./fio --name=rw_bg --numjobs=1 --filename=/mnt/f2fs_mount/fio-test.file \ - --bs=32768K --rw=read --ioengine=psync --refill_buffers --group_reporting \ - --runtime=360 --time_based --filesize=128M +{ + mkdir $DISK_PATH/f2fs_test + ./fio --name=rw_bg --numjobs=1 --filename=$DISK_PATH/f2fs_test/fio-test.file \ + --bs=32768K --rw=read --ioengine=sync --refill_buffers --group_reporting \ + --runtime=360 --time_based --filesize=128M } run_fio \ No newline at end of file diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh index 0886d84..9174a76 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh @@ -20,19 +20,33 @@ # History: April 8 2022 - init scripts # ################################################################################ -export IMG_FILE=/data/image_f2fs create_catalogue() { - mkdir /mnt/f2fs_mount/ + export DISK_PATH=$(mount | grep f2fs | cut -F 3) + export DISK_NAME=$(df -h |grep /dev/block |grep $DISK_PATH |awk '{print $1}' |cut -d "/" -f4) +} + +test_remount() +{ + gc_merge_mount_opt=$(mount |grep gc_merge) + if [[ "$gc_merge_mount_opt" == "" ]] ;then + mount -o remount,gc_merge $DISK_PATH/ + mount -o remount,nogc_merge $DISK_PATH/ + else + mount -o remount,nogc_merge $DISK_PATH/ + mount -o remount,gc_merge $DISK_PATH/ + fi + mount -o remount,rw $DISK_PATH/ } enable_init() { - dd if=/dev/zero of=$IMG_FILE bs=1M count=20480 + } echo "***************************ENHANCED INIT START***************************" create_catalogue +test_remount enable_init echo "***************************ENHANCED INIT END*****************************" diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh b/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh index 5602e4d..c4d77df 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh @@ -23,8 +23,7 @@ delete_catalogue() { - rm /mnt/f2fs_mount/* - rmdir /mnt/f2fs_mount + } echo "***************************enhanced UNINIT START**************************" -- Gitee