| Message ID | 20240408133243.694134-5-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] xfs: remove support for tools and kernels with v5 support | expand |
On Mon, Apr 08, 2024 at 03:32:41PM +0200, Christoph Hellwig wrote: > Remove the test on nocrc file systems as v5 has been the default for 10 > years and the kernel has made v4 support optional, which would fail this > sub-case. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > tests/xfs/263 | 5 --- > tests/xfs/263.out | 85 ----------------------------------------------- > 2 files changed, 90 deletions(-) > > diff --git a/tests/xfs/263 b/tests/xfs/263 > index bd30dab11..54e9355aa 100755 > --- a/tests/xfs/263 > +++ b/tests/xfs/263 > @@ -66,11 +66,6 @@ function test_all_state() > done > } > > -echo "==== NO CRC ====" > -_scratch_mkfs_xfs "-m crc=0 -n ftype=0" >> $seqres.full > -test_all_state I think we should continue testing V4 quota options all the way to the end of support (~2030) by splitting these into two tests, one of which can use the _require_xfs_nocrc predicate introduced in the next patch. Thoughts? --D > - > -echo "==== CRC ====" > _scratch_mkfs_xfs "-m crc=1" >>$seqres.full > test_all_state > > diff --git a/tests/xfs/263.out b/tests/xfs/263.out > index 531d45de5..64c1a5876 100644 > --- a/tests/xfs/263.out > +++ b/tests/xfs/263.out > @@ -1,89 +1,4 @@ > QA output created by 263 > -==== NO CRC ==== > -== Options: rw == > -== Options: usrquota,rw == > -User quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Group quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Project quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Blocks grace time: [7 days] > -Inodes grace time: [7 days] > -Realtime Blocks grace time: [7 days] > -== Options: grpquota,rw == > -User quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode #XXX (1 blocks, 1 extents) > -Group quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Project quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Blocks grace time: [7 days] > -Inodes grace time: [7 days] > -Realtime Blocks grace time: [7 days] > -== Options: usrquota,grpquota,rw == > -User quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Group quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Project quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Blocks grace time: [7 days] > -Inodes grace time: [7 days] > -Realtime Blocks grace time: [7 days] > -== Options: prjquota,rw == > -User quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode #XXX (1 blocks, 1 extents) > -Group quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Project quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Blocks grace time: [7 days] > -Inodes grace time: [7 days] > -Realtime Blocks grace time: [7 days] > -== Options: usrquota,prjquota,rw == > -User quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Group quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: OFF > - Enforcement: OFF > - Inode: N/A > -Project quota state on SCRATCH_MNT (SCRATCH_DEV) > - Accounting: ON > - Enforcement: ON > - Inode #XXX (1 blocks, 1 extents) > -Blocks grace time: [7 days] > -Inodes grace time: [7 days] > -Realtime Blocks grace time: [7 days] > -== Options: grpquota,prjquota,rw == > -== Options: usrquota,grpquota,prjquota,rw == > -==== CRC ==== > == Options: rw == > == Options: usrquota,rw == > User quota state on SCRATCH_MNT (SCRATCH_DEV) > -- > 2.39.2 > >
On Tue, Apr 09, 2024 at 08:57:28AM -0700, Darrick J. Wong wrote: > I think we should continue testing V4 quota options all the way to the > end of support (~2030) by splitting these into two tests, one of which > can use the _require_xfs_nocrc predicate introduced in the next patch. > Thoughts? Sure.
diff --git a/tests/xfs/263 b/tests/xfs/263 index bd30dab11..54e9355aa 100755 --- a/tests/xfs/263 +++ b/tests/xfs/263 @@ -66,11 +66,6 @@ function test_all_state() done } -echo "==== NO CRC ====" -_scratch_mkfs_xfs "-m crc=0 -n ftype=0" >> $seqres.full -test_all_state - -echo "==== CRC ====" _scratch_mkfs_xfs "-m crc=1" >>$seqres.full test_all_state diff --git a/tests/xfs/263.out b/tests/xfs/263.out index 531d45de5..64c1a5876 100644 --- a/tests/xfs/263.out +++ b/tests/xfs/263.out @@ -1,89 +1,4 @@ QA output created by 263 -==== NO CRC ==== -== Options: rw == -== Options: usrquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: grpquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: usrquota,grpquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: prjquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: usrquota,prjquota,rw == -User quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Group quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: OFF - Enforcement: OFF - Inode: N/A -Project quota state on SCRATCH_MNT (SCRATCH_DEV) - Accounting: ON - Enforcement: ON - Inode #XXX (1 blocks, 1 extents) -Blocks grace time: [7 days] -Inodes grace time: [7 days] -Realtime Blocks grace time: [7 days] -== Options: grpquota,prjquota,rw == -== Options: usrquota,grpquota,prjquota,rw == -==== CRC ==== == Options: rw == == Options: usrquota,rw == User quota state on SCRATCH_MNT (SCRATCH_DEV)
Remove the test on nocrc file systems as v5 has been the default for 10 years and the kernel has made v4 support optional, which would fail this sub-case. Signed-off-by: Christoph Hellwig <hch@lst.de> --- tests/xfs/263 | 5 --- tests/xfs/263.out | 85 ----------------------------------------------- 2 files changed, 90 deletions(-)