On Tue, Dec 5, 2023 at 5:47 PM Johannes Thumshirn <johannes.thumshirn@xxxxxxx> wrote: > > Add tests for btrfs' raid-stripe-tree feature. All of these test work by > writing a specific pattern to a newly created filesystem and afterwards > using `btrfs inspect-internal -t raid-stripe $SCRATCH_DEV_POOL` to verify > the placement and the layout of the metadata. > > The md5sum of each file will be compared as well after a re-mount of the > filesystem. > > --- > Changes in v3: > - added 'raid-stripe-tree' to mkfs options, as only zoned raid gets it > automatically > - Rename test cases as btrfs/302 and btrfs/303 already exist upstream > - Link to v2: https://lore.kernel.org/r/20231205-btrfs-raid-v2-0-25f80eea345b@xxxxxxx > > Changes in v2: > - Re-ordered series so the newly introduced group is added before the > tests > - Changes Filipe requested to the tests. > - Link to v1: https://lore.kernel.org/r/20231204-btrfs-raid-v1-0-b254eb1bcff8@xxxxxxx > > --- > Johannes Thumshirn (7): > fstests: doc: add new raid-stripe-tree group > common: add filter for btrfs raid-stripe dump > btrfs: add fstest for stripe-tree metadata with 4k write > btrfs: add fstest for 8k write spanning two stripes on raid-stripe-tree > btrfs: add fstest for writing to a file at an offset with RST > btrfs: add fstests to write 128k to a RST filesystem > btrfs: add fstest for overwriting a file partially with RST Just one more thing, and sorry I didn't notice before. All the tests fail when running with compression enabled, for example: root 19:41:12 /home/fdmanana/git/hub/xfstests > MOUNT_OPTIONS="-o compress" ./check btrfs/305 FSTYP -- btrfs PLATFORM -- Linux/x86_64 debian0 6.7.0-rc3-btrfs-next-143+ #1 SMP PREEMPT_DYNAMIC Mon Dec 4 11:01:37 WET 2023 MKFS_OPTIONS -- /dev/sdb MOUNT_OPTIONS -- -o compress /dev/sdb /home/fdmanana/btrfs-tests/scratch_1 btrfs/305 1s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/305.out.bad) --- tests/btrfs/305.out 2023-12-05 19:35:00.986326843 +0000 +++ /home/fdmanana/git/hub/xfstests/results//btrfs/305.out.bad 2023-12-05 19:43:31.098623435 +0000 @@ -14,15 +14,12 @@ checksum calced <CHECKSUM> fs uuid <UUID> chunk uuid <UUID> - item 0 key (XXXXXX RAID_STRIPE 61440) itemoff XXXXX itemsize 24 + item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24 encoding: RAID0 stripe 0 devid 1 physical XXXXXXXXX ... (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/305.out /home/fdmanana/git/hub/xfstests/results//btrfs/305.out.bad' to see the entire diff) Ran: btrfs/305 Failures: btrfs/305 Failed 1 of 1 tests Also, they all fail when the free space tree is disabled, like this: root 19:45:30 /home/fdmanana/git/hub/xfstests > MKFS_OPTIONS="-O ^free-space-tree" ./check btrfs/304 FSTYP -- btrfs PLATFORM -- Linux/x86_64 debian0 6.7.0-rc3-btrfs-next-143+ #1 SMP PREEMPT_DYNAMIC Mon Dec 4 11:01:37 WET 2023 MKFS_OPTIONS -- -O ^free-space-tree /dev/sdb MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1 btrfs/304 1s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/304.out.bad) --- tests/btrfs/304.out 2023-12-05 19:34:01.040411746 +0000 +++ /home/fdmanana/git/hub/xfstests/results//btrfs/304.out.bad 2023-12-05 19:45:36.242621419 +0000 @@ -15,6 +15,156 @@ item 0 key (XXXXXX RAID_STRIPE 4096) itemoff XXXXX itemsize 24 encoding: RAID0 stripe 0 devid 1 physical XXXXXXXXX + item 1 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24 + encoding: RAID0 + stripe 0 devid 1 physical XXXXXXXXX + item 2 key (XXXXXX RAID_STRIPE 65536) itemoff XXXXX itemsize 24 ... (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/304.out /home/fdmanana/git/hub/xfstests/results//btrfs/304.out.bad' to see the entire diff) Ran: btrfs/304 Failures: btrfs/304 Failed 1 of 1 tests And with nodatacow, only one of them fails: root 19:46:16 /home/fdmanana/git/hub/xfstests > MOUNT_OPTIONS="-o nodatacow" ./check btrfs/304 btrfs/305 btrfs/306 btrfs/307 btrfs/308 FSTYP -- btrfs PLATFORM -- Linux/x86_64 debian0 6.7.0-rc3-btrfs-next-143+ #1 SMP PREEMPT_DYNAMIC Mon Dec 4 11:01:37 WET 2023 MKFS_OPTIONS -- /dev/sdb MOUNT_OPTIONS -- -o nodatacow /dev/sdb /home/fdmanana/btrfs-tests/scratch_1 btrfs/304 1s ... 1s btrfs/305 1s ... 1s btrfs/306 1s ... 1s btrfs/307 1s ... 1s btrfs/308 0s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/308.out.bad) --- tests/btrfs/308.out 2023-12-05 19:37:38.379355089 +0000 +++ /home/fdmanana/git/hub/xfstests/results//btrfs/308.out.bad 2023-12-05 19:46:33.716457540 +0000 @@ -28,9 +28,6 @@ item 3 key (XXXXXX RAID_STRIPE 32768) itemoff XXXXX itemsize 24 encoding: RAID0 stripe 0 devid 1 physical XXXXXXXXX - item 4 key (XXXXXX RAID_STRIPE 8192) itemoff XXXXX itemsize 24 - encoding: RAID0 - stripe 0 devid 1 physical XXXXXXXXX total bytes XXXXXXXX ... (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/308.out /home/fdmanana/git/hub/xfstests/results//btrfs/308.out.bad' to see the entire diff) Ran: btrfs/304 btrfs/305 btrfs/306 btrfs/307 btrfs/308 Failures: btrfs/308 Failed 1 of 5 tests For the compression, we can just add a "_require_no_compress". We should also skip them when free space tree is not enabled or nodatacow is enabled for 308 (don't recall if we already have helpers for that). Other than that, everything looks good to me. Thanks. > > common/filter.btrfs | 14 +++++++ > doc/group-names.txt | 1 + > tests/btrfs/304 | 53 ++++++++++++++++++++++++++ > tests/btrfs/304.out | 58 ++++++++++++++++++++++++++++ > tests/btrfs/305 | 58 ++++++++++++++++++++++++++++ > tests/btrfs/305.out | 82 ++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/306 | 56 +++++++++++++++++++++++++++ > tests/btrfs/306.out | 75 +++++++++++++++++++++++++++++++++++++ > tests/btrfs/307 | 53 ++++++++++++++++++++++++++ > tests/btrfs/307.out | 65 ++++++++++++++++++++++++++++++++ > tests/btrfs/308 | 56 +++++++++++++++++++++++++++ > tests/btrfs/308.out | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 12 files changed, 677 insertions(+) > --- > base-commit: 5649843ef186de89f58bc69b04a8dc86adf8f1ae > change-id: 20231204-btrfs-raid-75975797f97d > > Best regards, > -- > Johannes Thumshirn <johannes.thumshirn@xxxxxxx> > >
