From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q3QFnYNQ067776 for ; Thu, 26 Apr 2012 10:49:34 -0500 Received: from mail.sandeen.net (sandeen.net [63.231.237.45]) by cuda.sgi.com with ESMTP id mgYRUkMCGUjcW9a1 for ; Thu, 26 Apr 2012 08:49:33 -0700 (PDT) Message-ID: <4F996E8C.7030301@sandeen.net> Date: Thu, 26 Apr 2012 10:49:32 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: Re: [PATCH 2/2] xfstests 273: fix of reading scratch size and removing lost+found References: <1335351177-3014-1-git-send-email-tmarek@redhat.com> <1335351177-3014-2-git-send-email-tmarek@redhat.com> In-Reply-To: <1335351177-3014-2-git-send-email-tmarek@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 Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Tom Marek Cc: lczerner@redhat.com, dchinner@redhat.com, xfs@oss.sgi.com On 4/25/12 5:52 AM, Tom Marek wrote: > There were two reasons why test 273 was failing. Firstrly, when running on > ext4 fs it was removing everything from SCRATCH_MNT directory at the beginning > of tests including the lost+found directory. This caused error while checking > scratch fs after finishing test. Secondly, obtaining of the partition size was > not counting with with behaviour of df utility which may split the line containg > informations about one partition when it is too long thus it may have returned > nothing. > > First problem was solved with removing all rm -rf commands and the > second one was fixed with alternative awk script which is able to deal with > any line splitting possible. Also 'umount $SCRATCH_DEV' was substituted for > '_scratch_unmount'. > > Signed-off-by: Tom Marek > --- > 273 | 8 +++----- > 1 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/273 b/273 > index 2965132..8636241 100755 > --- a/273 > +++ b/273 > @@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > _cleanup() > { > cd / > - rm -rf $SCRATCH_MNT/* $tmp.* > + rm -rf $tmp.* $SCRATCH_MNT/origin $SCRATCH_MNT/sub* Why remove anything at all from $SCRATCH_MNT? It'll get re-mkfs'd next time it's used anyway. Other than that, patch seems fine. > _scratch_unmount > } > > @@ -68,7 +68,7 @@ _file_create() > > cd $SCRATCH_MNT/origin > > - _disksize=`df --block-size=1 | grep $SCRATCH_DEV | awk '{print $2}'` > + _disksize=`df --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=$(($_disksize / 3)) > _num=$(($_disksize / $count / $threads / 4096)) > _count=$count > @@ -106,8 +106,6 @@ _do_workload() > _pids="" > _pid=1 > > - rm -rf $SCRATCH_MNT/* > - > _threads_set > _file_create > > @@ -134,7 +132,7 @@ echo "------------------------------" > > rm -f $seq.full > > -umount $SCRATCH_DEV 2>/dev/null > +_scratch_unmount 2>/dev/null > _scratch_mkfs_sized $((2 * 1024 * 1024 * 1024)) >>$seq.full 2>&1 > _scratch_mount > _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs