apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfs/{050,299}: clear quota warnings in between checks

Browse Source 
Both of these quota tests contain the output of the xfs_quota repquota
command in the golden output.  Unfortunately, the output was recorded
before quota soft warnings were implemented, which means they'll regress
the output when we make quota warning work.  Fix this by resetting the
warning count to zero before generating output.

While we're at it, use $XFS_QUOTA_PROG instead of xfs_quota.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2020-07-30 11:34:38 -07:00
committed by Eryu Guan
parent 9515832478
commit e5bbd47e7c
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/050
+16 -7
View File
@@ -61,6 +61,7 @@ _filter_report()
$val = $ENV{'NUM_SPACE_FILES'}; $val = $ENV{'NUM_SPACE_FILES'};
} }
s/(^\[ROOT\] \S+ \S+ \S+ \S+ \[--------\] )(\S+)/$1@{[$2 - $val]}/g' | s/(^\[ROOT\] \S+ \S+ \S+ \S+ \[--------\] )(\S+)/$1@{[$2 - $val]}/g' |
sed -e 's/ 65535 \[--------\]/ 00 \[--------\]/g' |
perl -npe ' perl -npe '
s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|' s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
} }
@@ -128,9 +129,11 @@ _exercise()
echo "Using type=$type id=$id" >>$seqres.full echo "Using type=$type id=$id" >>$seqres.full
$XFS_QUOTA_PROG -x -c "warn -$type 65535 -d" $SCRATCH_DEV
echo echo
echo "*** report no quota settings" | tee -a $seqres.full echo "*** report no quota settings" | tee -a $seqres.full
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -139,11 +142,11 @@ _exercise()
_file_as_id $SCRATCH_MNT/initme $id $type 1024 0 _file_as_id $SCRATCH_MNT/initme $id $type 1024 0
echo "ls -l $SCRATCH_MNT" >>$seqres.full echo "ls -l $SCRATCH_MNT" >>$seqres.full
ls -l $SCRATCH_MNT >>$seqres.full ls -l $SCRATCH_MNT >>$seqres.full
xfs_quota -D $tmp.projects -P $temp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $temp.projid -x \
-c "limit -$type bsoft=${bsoft} bhard=${bhard} $id" \ -c "limit -$type bsoft=${bsoft} bhard=${bhard} $id" \
-c "limit -$type isoft=$isoft ihard=$ihard $id" \ -c "limit -$type isoft=$isoft ihard=$ihard $id" \
$SCRATCH_DEV $SCRATCH_DEV
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -154,7 +157,8 @@ _exercise()
_file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0 _file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0
_file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0 _file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -162,7 +166,9 @@ _exercise()
echo "*** push past the soft block limit" | tee -a $seqres.full echo "*** push past the soft block limit" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/softie $id $type $bsize 300 _file_as_id $SCRATCH_MNT/softie $id $type $bsize 300
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" \
-c "warn -b -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -174,7 +180,9 @@ _exercise()
_file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0 _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
done done
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" \
-c "warn -i -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -185,7 +193,8 @@ _exercise()
echo "ls -l $SCRATCH_MNT" >>$seqres.full echo "ls -l $SCRATCH_MNT" >>$seqres.full
ls -l $SCRATCH_MNT >>$seqres.full ls -l $SCRATCH_MNT >>$seqres.full
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_and_check_blks | LC_COLLATE=POSIX sort -ru _filter_and_check_blks | LC_COLLATE=POSIX sort -ru
tests/xfs/299
+16 -7
View File
@@ -54,6 +54,7 @@ _filter_report()
$val = $ENV{'NUM_SPACE_FILES'}; $val = $ENV{'NUM_SPACE_FILES'};
} }
s/(^\[ROOT\] \S+ \S+ \S+ \S+ \[--------\] )(\S+)/$1@{[$2 - $val]}/g' | s/(^\[ROOT\] \S+ \S+ \S+ \S+ \[--------\] )(\S+)/$1@{[$2 - $val]}/g' |
sed -e 's/ 65535 \[--------\]/ 00 \[--------\]/g' |
perl -npe ' perl -npe '
s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|' s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
} }
@@ -114,9 +115,11 @@ _exercise()
echo "Using type=$type id=$id" >>$seqres.full echo "Using type=$type id=$id" >>$seqres.full
$XFS_QUOTA_PROG -x -c "warn -$type 65535 -d" $SCRATCH_DEV
echo echo
echo "*** report no quota settings" | tee -a $seqres.full echo "*** report no quota settings" | tee -a $seqres.full
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -125,11 +128,11 @@ _exercise()
_file_as_id $SCRATCH_MNT/initme $id $type 1024 0 _file_as_id $SCRATCH_MNT/initme $id $type 1024 0
echo "ls -l $SCRATCH_MNT" >>$seqres.full echo "ls -l $SCRATCH_MNT" >>$seqres.full
ls -l $SCRATCH_MNT >>$seqres.full ls -l $SCRATCH_MNT >>$seqres.full
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "limit -$type bsoft=${bsoft} bhard=${bhard} $id" \ -c "limit -$type bsoft=${bsoft} bhard=${bhard} $id" \
-c "limit -$type isoft=$isoft ihard=$ihard $id" \ -c "limit -$type isoft=$isoft ihard=$ihard $id" \
$SCRATCH_DEV $SCRATCH_DEV
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -140,7 +143,8 @@ _exercise()
_file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0 _file_as_id $SCRATCH_MNT/softie3 $id $type 1024 0
_file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0 _file_as_id $SCRATCH_MNT/softie4 $id $type 1024 0
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -148,7 +152,9 @@ _exercise()
echo "*** push past the soft block limit" | tee -a $seqres.full echo "*** push past the soft block limit" | tee -a $seqres.full
_file_as_id $SCRATCH_MNT/softie $id $type $bsize 200 _file_as_id $SCRATCH_MNT/softie $id $type $bsize 200
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" \
-c "warn -b -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -160,7 +166,9 @@ _exercise()
_file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0 _file_as_id $SCRATCH_MNT/hard$i $id $type 1024 0
done done
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" \
-c "warn -i -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_report | LC_COLLATE=POSIX sort -ru _filter_report | LC_COLLATE=POSIX sort -ru
@@ -171,7 +179,8 @@ _exercise()
echo "ls -l $SCRATCH_MNT" >>$seqres.full echo "ls -l $SCRATCH_MNT" >>$seqres.full
ls -l $SCRATCH_MNT >>$seqres.full ls -l $SCRATCH_MNT >>$seqres.full
_qmount _qmount
xfs_quota -D $tmp.projects -P $tmp.projid -x \ $XFS_QUOTA_PROG -x -c "warn -b -$type 0 $id" $SCRATCH_DEV
$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
-c "repquota -birnN -$type" $SCRATCH_DEV | -c "repquota -birnN -$type" $SCRATCH_DEV |
_filter_and_check_blks | LC_COLLATE=POSIX sort -ru _filter_and_check_blks | LC_COLLATE=POSIX sort -ru