mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfs/050: work with 64k block size
This commit changes the test to calculate quota limits based on the block size of the underlying filesystem. Also, the sizes of the test files are now made to be a multiple of the filesystem block size. Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com> Tested-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
05802a3a8a
commit
371cf4cf16
+16
-8
@@ -38,8 +38,13 @@ chmod a+rwx $seqres.full # arbitrary users will write here
|
||||
_require_scratch
|
||||
_require_xfs_quota
|
||||
|
||||
bsoft=100
|
||||
bhard=500
|
||||
_scratch_mkfs >/dev/null 2>&1
|
||||
_scratch_mount
|
||||
bsize=$(_get_file_block_size $SCRATCH_MNT)
|
||||
_scratch_unmount
|
||||
|
||||
bsoft=$(( 200 * $bsize ))
|
||||
bhard=$(( 1000 * $bsize ))
|
||||
isoft=4
|
||||
ihard=10
|
||||
|
||||
@@ -55,7 +60,9 @@ _filter_report()
|
||||
if ($ENV{'LARGE_SCRATCH_DEV'}) {
|
||||
$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' |
|
||||
perl -npe '
|
||||
s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
|
||||
}
|
||||
|
||||
# The actual point at which limit enforcement takes place for the
|
||||
@@ -70,9 +77,10 @@ _filter_and_check_blks()
|
||||
if (/^\#'$id'\s+(\d+)/ && '$enforce') {
|
||||
$maximum = '$bhard';
|
||||
$minimum = '$bhard' * 85/100;
|
||||
if (($1 < $minimum || $1 > $maximum) && '$noextsz') {
|
||||
$used = $1 * 1024;
|
||||
if (($used < $minimum || $used > $maximum) && '$noextsz') {
|
||||
printf(" URK %d: %d is out of range! [%d,%d]\n",
|
||||
'$id', $1, $minimum, $maximum);
|
||||
'$id', $used, $minimum, $maximum);
|
||||
}
|
||||
s/^(\#'$id'\s+)(\d+)/\1 =OK=/g;
|
||||
}
|
||||
@@ -132,7 +140,7 @@ _exercise()
|
||||
echo "ls -l $SCRATCH_MNT" >>$seqres.full
|
||||
ls -l $SCRATCH_MNT >>$seqres.full
|
||||
xfs_quota -D $tmp.projects -P $temp.projid -x \
|
||||
-c "limit -$type bsoft=${bsoft}k bhard=${bhard}k $id" \
|
||||
-c "limit -$type bsoft=${bsoft} bhard=${bhard} $id" \
|
||||
-c "limit -$type isoft=$isoft ihard=$ihard $id" \
|
||||
$SCRATCH_DEV
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
@@ -152,7 +160,7 @@ _exercise()
|
||||
|
||||
echo
|
||||
echo "*** push past the soft block limit" | tee -a $seqres.full
|
||||
_file_as_id $SCRATCH_MNT/softie $id $type 1024 140
|
||||
_file_as_id $SCRATCH_MNT/softie $id $type $bsize 300
|
||||
_qmount
|
||||
xfs_quota -D $tmp.projects -P $tmp.projid -x \
|
||||
-c "repquota -birnN -$type" $SCRATCH_DEV |
|
||||
@@ -173,7 +181,7 @@ _exercise()
|
||||
echo
|
||||
# Note: for quota accounting (not enforcement), EDQUOT is not expected
|
||||
echo "*** push past the hard block limit (expect EDQUOT)" | tee -a $seqres.full
|
||||
_file_as_id $SCRATCH_MNT/softie $id $type 1024 540
|
||||
_file_as_id $SCRATCH_MNT/softie $id $type $bsize 1200
|
||||
echo "ls -l $SCRATCH_MNT" >>$seqres.full
|
||||
ls -l $SCRATCH_MNT >>$seqres.full
|
||||
_qmount
|
||||
|
||||
+30
-30
@@ -12,23 +12,23 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 200 1000 0 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
*** group
|
||||
@@ -44,23 +44,23 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 100 500 00 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 200 1000 0 [7 days] 10 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
*** uqnoenforce
|
||||
@@ -76,23 +76,23 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 540 100 500 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 1200 200 1000 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
*** gqnoenforce
|
||||
@@ -108,23 +108,23 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 540 100 500 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 1200 200 1000 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
*** pquota
|
||||
@@ -140,23 +140,23 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 6 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 100 500 00 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
[NAME] =OK= 200 1000 0 [7 days] 9 4 10 00 [7 days] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
*** pqnoenforce
|
||||
@@ -172,22 +172,22 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
|
||||
*** report initial settings
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 1 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft inode limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 100 500 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 0 200 1000 00 [--------] 5 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the soft block limit
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 6 4 10 00 [--------] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard inode limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 140 100 500 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 300 200 1000 00 [--------] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** push past the hard block limit (expect EDQUOT)
|
||||
[ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
|
||||
[NAME] 540 100 500 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
[NAME] 1200 200 1000 00 [--none--] 18 4 10 00 [--none--] 0 0 0 00 [--------]
|
||||
|
||||
*** unmount
|
||||
|
||||
Reference in New Issue
Block a user