To cover cases when fstrim arguments are not block/block group/file system size aligned, we can be a bit more random. This commit changes fstrim argument computing to use $RANDOM bash variable in order to have different minlen, start, len argument settings and change the full fs fstrim to be called randomly as well. Also make kill and wait not complain about non existent process, since it may have already finished before we attempt to kill it and wait for it. No reason to fail the test. Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx> --- 251 | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/251 b/251 index fa3d74a..0b68898 100755 --- a/251 +++ b/251 @@ -54,21 +54,21 @@ _cleanup() _destroy() { - kill $pids $fstrim_pid - wait $pids $fstrim_pid + kill $pids $fstrim_pid 2> /dev/null + wait $pids $fstrim_pid 2> /dev/null rm -rf $tmp } _destroy_fstrim() { - kill $fpid - wait $fpid + kill $fpid 2> /dev/null + wait $fpid 2> /dev/null } _fail() { echo "$1" - kill $mypid + kill $mypid 2> /dev/null } _check_fstrim_support() @@ -87,13 +87,16 @@ fstrim_loop() fsize=$(df | grep $SCRATCH_MNT | grep $SCRATCH_DEV | awk '{print $2}') while true ; do - step=1048576 + step=$((RANDOM*$RANDOM)) + minlen=$((RANDOM*($RANDOM%2+1))) start=0 - $here/src/fstrim $SCRATCH_MNT & - fpid=$! - wait $fpid + if [ $((RANDOM%10)) -gt 7 ]; then + $here/src/fstrim $SCRATCH_MNT & + fpid=$! + wait $fpid + fi while [ $start -lt $fsize ] ; do - $here/src/fstrim -s ${start}k -l ${step}k $SCRATCH_MNT & + $here/src/fstrim -m ${minlen}k -s ${start}k -l ${step}k $SCRATCH_MNT & fpid=$! wait $fpid start=$(( $start + $step )) -- 1.7.4.4 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs