On Wed, Nov 20, 2013 at 12:54:30PM -0500, Brian Foster wrote:
> generic/273 factors the "space available" output from df into the
> calculation for the size of the origin data set. Recent commit
>
> bfdd1e72b358 xfstests: added -P option to $DF_PROG
>
> ... converted the use of 'df' to $DF_PROG. This implicitly adds the
> -T parameter to add the fs type column, shifts the available space
> column over by one and unintentionally causes 273 to look at "used
> space" and create too small of a data set for a useful test.
> Realign to the to the available space value.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> ---
> tests/generic/273 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/generic/273 b/tests/generic/273
> index 63bbf9b..2d54493 100755
> --- a/tests/generic/273
> +++ b/tests/generic/273
> @@ -68,7 +68,7 @@ _file_create()
>
> cd $SCRATCH_MNT/origin
>
> - _disksize=`$DF_PROG --block-size=1 $SCRATCH_DEV | awk -v sd=$SCRATCH_DEV 'BEGIN{c=0}{for(i=1;i<=NF;++i){a[c]=$i;++c}}END{for(entry in a){if(a[entry] ~ sd){print a[entry + 3]; break}}}'`
> + _disksize=`$DF_PROG --block-size=1 $SCRATCH_DEV | awk -v sd=$SCRATCH_DEV 'BEGIN{c=0}{for(i=1;i<=NF;++i){a[c]=$i;++c}}END{for(entry in a){if(a[entry] ~ sd){print a[entry + 4]; break}}}'`
> _disksize=$(($_disksize / 3))
> _num=$(($_disksize / $count / $threads / 4096))
> _count=$count
Just what is this bunch of unmaintainable line noise actually doing?
$ df -T -P --block-size=1 $SCRATCH_DEV | awk -v sd=$SCRATCH_DEV 'BEGIN{c=0}{for(i=1;i<=NF;++i){a[c]=$i;++c}}END{for(entry in a){if(a[entry] ~ sd){print a[entry + 4]; break}}}'
5282562048
$
Ok, someone didn't know about --output:
$ df --block-size=1 --output=avail $SCRATCH_DEV | tail -1
5282562048
$
But --output is incompatible with DF_PROG="df -T -P" and so we need
to do:
$ df -T -P --block-size=1 $SCRATCH_DEV | tail -1 | awk '// { print $5 }'
5282562048
$
Looks a little easier to understand, yes?
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
