diff mbox series

generic/619: a better way to get tot_avail_size

Message ID 20210415045102.4099962-1-sunke32@huawei.com (mailing list archive)
State New, archived
Headers show
Series generic/619: a better way to get tot_avail_size | expand

Commit Message

Sun Ke April 15, 2021, 4:51 a.m. UTC
When FSTYP is tmpfs, $DF_PROG --block-size=1 $SCRATCH_DEV is not suitted.

Signei-off-by: Sun Ke <sunke32@huawei.com>
---
 tests/generic/619 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eryu Guan April 18, 2021, 10:59 a.m. UTC | #1
On Thu, Apr 15, 2021 at 12:51:02AM -0400, Sun Ke wrote:
> When FSTYP is tmpfs, $DF_PROG --block-size=1 $SCRATCH_DEV is not suitted.
> 
> Signei-off-by: Sun Ke <sunke32@huawei.com>
> ---
>  tests/generic/619 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/generic/619 b/tests/generic/619
> index 3c43fe746917..76d6b2c470b9 100755
> --- a/tests/generic/619
> +++ b/tests/generic/619
> @@ -89,7 +89,7 @@ calc_thread_cnt()
>  	IFS=',' read -ra fratio <<< $file_ratio
>  	file_ratio_cnt=${#fratio[@]}
>  
> -	tot_avail_size=$($DF_PROG --block-size=1 $SCRATCH_DEV | awk 'FNR == 2 { print $5 }')

Does s/$SCRATCH_DEV/$SCRATCH_MNT/ work for you? And please replace 'awk'
with $AWK_PROG while we're at it.

Thanks,
Eryu

> +	tot_avail_size=$(echo $($DF_PROG | grep -w $SCRATCH_DEV | awk '{print $5}')*1024 | $BC_PROG)
>  	avail_size=$(echo $tot_avail_size*$disk_saturation | $BC_PROG)
>  	thread_cnt=$(echo "$file_ratio_cnt*($avail_size/$file_ratio_unit)" | $BC_PROG)
>  
> -- 
> 2.25.4
diff mbox series

Patch

diff --git a/tests/generic/619 b/tests/generic/619
index 3c43fe746917..76d6b2c470b9 100755
--- a/tests/generic/619
+++ b/tests/generic/619
@@ -89,7 +89,7 @@  calc_thread_cnt()
 	IFS=',' read -ra fratio <<< $file_ratio
 	file_ratio_cnt=${#fratio[@]}
 
-	tot_avail_size=$($DF_PROG --block-size=1 $SCRATCH_DEV | awk 'FNR == 2 { print $5 }')
+	tot_avail_size=$(echo $($DF_PROG | grep -w $SCRATCH_DEV | awk '{print $5}')*1024 | $BC_PROG)
 	avail_size=$(echo $tot_avail_size*$disk_saturation | $BC_PROG)
 	thread_cnt=$(echo "$file_ratio_cnt*($avail_size/$file_ratio_unit)" | $BC_PROG)