From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id AE65A7F3F for ; Wed, 20 Nov 2013 20:46:12 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay1.corp.sgi.com (Postfix) with ESMTP id 7A2F88F8050 for ; Wed, 20 Nov 2013 18:46:12 -0800 (PST) Received: from ipmail05.adl6.internode.on.net (ipmail05.adl6.internode.on.net [150.101.137.143]) by cuda.sgi.com with ESMTP id ILXd8iapPOgrLSQd for ; Wed, 20 Nov 2013 18:46:10 -0800 (PST) Date: Thu, 21 Nov 2013 13:46:05 +1100 From: Dave Chinner Subject: Re: [PATCH] xfstests: use correct size value in generic/273 Message-ID: <20131121024605.GB6188@dastard> References: <1384970070-58732-1-git-send-email-bfoster@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1384970070-58732-1-git-send-email-bfoster@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Brian Foster Cc: xfs@oss.sgi.com 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 > --- > 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@fromorbit.com _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs