On Thu, Feb 15, 2024 at 6:35 AM Anand Jain <anand.jain@xxxxxxxxxx> wrote: > > Make sure that basic functions such as seeding and device add fail, > while balance runs successfully with tempfsid. > > Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx> > --- > common/filter.btrfs | 6 ++++ > tests/btrfs/315 | 79 +++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/315.out | 11 +++++++ > 3 files changed, 96 insertions(+) > create mode 100755 tests/btrfs/315 > create mode 100644 tests/btrfs/315.out > > diff --git a/common/filter.btrfs b/common/filter.btrfs > index 8ab76fcb193a..d48e96c6f66b 100644 > --- a/common/filter.btrfs > +++ b/common/filter.btrfs > @@ -68,6 +68,12 @@ _filter_btrfs_device_stats() > sed -e "s/ *$NUMDEVS /<NUMDEVS> /g" > } > > +_filter_btrfs_device_add() > +{ > + _filter_scratch_pool | \ > + sed -E 's/\(([0-9]+(\.[0-9]+)?)[a-zA-Z]+B\)/\(NUM\)/' Why do we need this new filter? We are testing for a failure, where none of this is relevant except filtering device names. The test can just filter with _filter_scratch_pool only. > +} > + > _filter_transaction_commit() { > sed -e "/Transaction commit: none (default)/d" \ > -e "s/Delete subvolume [0-9]\+ (.*commit):/Delete subvolume/g" \ > diff --git a/tests/btrfs/315 b/tests/btrfs/315 > new file mode 100755 > index 000000000000..7ad0dfbc9c32 > --- /dev/null > +++ b/tests/btrfs/315 > @@ -0,0 +1,79 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2024 YOUR NAME HERE. All Rights Reserved. > +# > +# FS QA Test 315 > +# > +# Verify if the seed and device add to a tempfsid filesystem fails. > +# > +. ./common/preamble > +_begin_fstest auto quick volume seed tempfsid > + > +_cleanup() > +{ > + cd / > + umount $tempfsid_mnt 2>/dev/null $UMOUNT_PROG > + rm -r -f $tmp.* > + rm -r -f $tempfsid_mnt > +} > + > +. ./common/filter.btrfs > + > +_supported_fs btrfs > +_require_btrfs_sysfs_fsid > +_require_scratch_dev_pool 3 > +_require_btrfs_fs_feature temp_fsid > +_require_btrfs_command inspect-internal dump-super > +_require_btrfs_mkfs_uuid_option > + > +_scratch_dev_pool_get 3 > + > +# mount point for the tempfsid device > +tempfsid_mnt=$TEST_DIR/$seq/tempfsid_mnt > + > +seed_device_must_fail() > +{ > + echo ---- $FUNCNAME ---- > + > + mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]} > + > + $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV} > + $BTRFS_TUNE_PROG -S 1 ${SCRATCH_DEV_NAME[1]} > + > + _scratch_mount 2>&1 | _filter_scratch > + _mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt} 2>&1 | _filter_test_dir > +} > + > +device_add_must_fail() > +{ > + echo ---- $FUNCNAME ---- > + > + mkfs_clone ${SCRATCH_DEV} ${SCRATCH_DEV_NAME[1]} > + _scratch_mount > + _mount ${SCRATCH_DEV_NAME[1]} ${tempfsid_mnt} > + > + $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | \ > + _filter_xfs_io > + > +$BTRFS_UTIL_PROG device add -f ${SCRATCH_DEV_NAME[2]} ${tempfsid_mnt} 2>&1 |\ > + _filter_btrfs_device_add We are testing for failure, so no need for the new filter _filter_btrfs_device_add. Just filter through _filter_scratch_pool here and nothing more. Thanks. > + > + echo Balance must be successful > + _run_btrfs_balance_start ${tempfsid_mnt} > +} > + > +mkdir -p $tempfsid_mnt > + > +seed_device_must_fail > + > +_scratch_unmount > +_cleanup > +mkdir -p $tempfsid_mnt > + > +device_add_must_fail > + > +_scratch_dev_pool_put > + > +# success, all done > +status=0 > +exit > diff --git a/tests/btrfs/315.out b/tests/btrfs/315.out > new file mode 100644 > index 000000000000..32149972beb4 > --- /dev/null > +++ b/tests/btrfs/315.out > @@ -0,0 +1,11 @@ > +QA output created by 315 > +---- seed_device_must_fail ---- > +mount: SCRATCH_MNT: WARNING: source write-protected, mounted read-only. > +mount: TEST_DIR/315/tempfsid_mnt: mount(2) system call failed: File exists. > +---- device_add_must_fail ---- > +wrote 9000/9000 bytes at offset 0 > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +ERROR: error adding device 'SCRATCH_DEV': Invalid argument > +Performing full device TRIM SCRATCH_DEV (NUM) ... > +Balance must be successful > +Done, had to relocate 3 out of 3 chunks > -- > 2.39.3 > >