* [ fstests PATCHv3 0/2] btrfs: Test subvolume delete by id feature @ 2020-02-24 3:13 Marcos Paulo de Souza 2020-02-24 3:13 ` [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command Marcos Paulo de Souza 2020-02-24 3:13 ` [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature Marcos Paulo de Souza 0 siblings, 2 replies; 9+ messages in thread From: Marcos Paulo de Souza @ 2020-02-24 3:13 UTC (permalink / raw) To: dsterba, nborisov, linux-btrfs, fstests, guaneryu; +Cc: Marcos Paulo de Souza From: Marcos Paulo de Souza <mpdesouza@suse.com> Changes from v2: * Added Reviewed-by from Nikolay to patch 0001 * Changed awk to $AWK_PROG, suggested by Eryu * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu * Created a local function to delete and list subvolumes, suggested by Eryu Changes from v1: * Added some prints printing what is being tested * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using plain integers * New patch expanding the funtionality of _require_btrfs_command, which now check for argument of subcommands Marcos Paulo de Souza (2): common: btrfs: Improve _require_btrfs_command btrfs: Test subvolume delete --subvolid feature common/btrfs | 13 ++++++-- tests/btrfs/203 | 73 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/203.out | 14 +++++++++ tests/btrfs/group | 1 + 4 files changed, 99 insertions(+), 2 deletions(-) create mode 100755 tests/btrfs/203 create mode 100644 tests/btrfs/203.out -- 2.25.0 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command 2020-02-24 3:13 [ fstests PATCHv3 0/2] btrfs: Test subvolume delete by id feature Marcos Paulo de Souza @ 2020-02-24 3:13 ` Marcos Paulo de Souza 2020-02-24 19:54 ` Johannes Thumshirn 2020-03-01 13:36 ` Eryu Guan 2020-02-24 3:13 ` [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature Marcos Paulo de Souza 1 sibling, 2 replies; 9+ messages in thread From: Marcos Paulo de Souza @ 2020-02-24 3:13 UTC (permalink / raw) To: dsterba, nborisov, linux-btrfs, fstests, guaneryu; +Cc: Marcos Paulo de Souza From: Marcos Paulo de Souza <mpdesouza@suse.com> Now _require_btrfs_command can also check for subfuntion options, like "subvolume delete --subvolid". Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> --- Changes from v2: * Added Reviewed-by from Nikolay to patch 0001 Changes from v1: * New patch expanding the funtionality of _require_btrfs_command, which now check for argument of subcommands common/btrfs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/common/btrfs b/common/btrfs index 19ac7cc4..ae3142b6 100644 --- a/common/btrfs +++ b/common/btrfs @@ -12,12 +12,14 @@ _btrfs_get_subvolid() # _require_btrfs_command <command> [<subcommand>|<option>] # We check for btrfs and (optionally) features of the btrfs command -# It can both subfunction like "inspect-internal dump-tree" and -# options like "check --qgroup-report" +# This function support both subfunction like "inspect-internal dump-tree" and +# options like "check --qgroup-report", and also subfunction options like +# "subvolume delete --subvolid" _require_btrfs_command() { local cmd=$1 local param=$2 + local param_arg=$3 local safe_param _require_command "$BTRFS_UTIL_PROG" btrfs @@ -39,6 +41,13 @@ _require_btrfs_command() $BTRFS_UTIL_PROG $cmd $param --help &> /dev/null [ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param)" + + test -z "$param_arg" && return + + # replace leading "-"s for grep + safe_param=$(echo $param_arg | sed 's/^-*//') + $BTRFS_UTIL_PROG $cmd $param --help | grep -wq $safe_param || \ + _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param $param_arg)" } # Require extra check on btrfs qgroup numbers -- 2.25.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command 2020-02-24 3:13 ` [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command Marcos Paulo de Souza @ 2020-02-24 19:54 ` Johannes Thumshirn 2020-03-01 13:36 ` Eryu Guan 1 sibling, 0 replies; 9+ messages in thread From: Johannes Thumshirn @ 2020-02-24 19:54 UTC (permalink / raw) To: Marcos Paulo de Souza, dsterba, nborisov, linux-btrfs, fstests, guaneryu Cc: Marcos Paulo de Souza On 23/02/2020 19:33, Marcos Paulo de Souza wrote: > Now _require_btrfs_command can also check for subfuntion options, like Nit: subfunction else Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command 2020-02-24 3:13 ` [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command Marcos Paulo de Souza 2020-02-24 19:54 ` Johannes Thumshirn @ 2020-03-01 13:36 ` Eryu Guan 1 sibling, 0 replies; 9+ messages in thread From: Eryu Guan @ 2020-03-01 13:36 UTC (permalink / raw) To: Marcos Paulo de Souza Cc: dsterba, nborisov, linux-btrfs, fstests, Marcos Paulo de Souza On Mon, Feb 24, 2020 at 12:13:40AM -0300, Marcos Paulo de Souza wrote: > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > Now _require_btrfs_command can also check for subfuntion options, like > "subvolume delete --subvolid". > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Ah, this patch has already been applied in previous updates. Please see 2f9b4039253d common/btrfs: Improve _require_btrfs_command Thanks, Eryu > --- > Changes from v2: > * Added Reviewed-by from Nikolay to patch 0001 > > Changes from v1: > * New patch expanding the funtionality of _require_btrfs_command, which now > check for argument of subcommands > > common/btrfs | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/common/btrfs b/common/btrfs > index 19ac7cc4..ae3142b6 100644 > --- a/common/btrfs > +++ b/common/btrfs > @@ -12,12 +12,14 @@ _btrfs_get_subvolid() > > # _require_btrfs_command <command> [<subcommand>|<option>] > # We check for btrfs and (optionally) features of the btrfs command > -# It can both subfunction like "inspect-internal dump-tree" and > -# options like "check --qgroup-report" > +# This function support both subfunction like "inspect-internal dump-tree" and > +# options like "check --qgroup-report", and also subfunction options like > +# "subvolume delete --subvolid" > _require_btrfs_command() > { > local cmd=$1 > local param=$2 > + local param_arg=$3 > local safe_param > > _require_command "$BTRFS_UTIL_PROG" btrfs > @@ -39,6 +41,13 @@ _require_btrfs_command() > > $BTRFS_UTIL_PROG $cmd $param --help &> /dev/null > [ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param)" > + > + test -z "$param_arg" && return > + > + # replace leading "-"s for grep > + safe_param=$(echo $param_arg | sed 's/^-*//') > + $BTRFS_UTIL_PROG $cmd $param --help | grep -wq $safe_param || \ > + _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param $param_arg)" > } > > # Require extra check on btrfs qgroup numbers > -- > 2.25.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature 2020-02-24 3:13 [ fstests PATCHv3 0/2] btrfs: Test subvolume delete by id feature Marcos Paulo de Souza 2020-02-24 3:13 ` [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command Marcos Paulo de Souza @ 2020-02-24 3:13 ` Marcos Paulo de Souza 2020-03-01 13:54 ` Eryu Guan 1 sibling, 1 reply; 9+ messages in thread From: Marcos Paulo de Souza @ 2020-02-24 3:13 UTC (permalink / raw) To: dsterba, nborisov, linux-btrfs, fstests, guaneryu; +Cc: Marcos Paulo de Souza From: Marcos Paulo de Souza <mpdesouza@suse.com> Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> --- Changes from v2: * Added 'Created subvolume...' into 203.out to match the subvolume creating command * Changed awk to $AWK_PROG, suggested by Eryu * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu * Created a local function to delete and list subvolumes, suggested by Eryu Changes from v1: * Added some prints printing what is being tested * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using plain integers tests/btrfs/203 | 68 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/203.out | 17 ++++++++++++ tests/btrfs/group | 1 + 3 files changed, 86 insertions(+) create mode 100755 tests/btrfs/203 create mode 100644 tests/btrfs/203.out diff --git a/tests/btrfs/203 b/tests/btrfs/203 new file mode 100755 index 00000000..0f662db1 --- /dev/null +++ b/tests/btrfs/203 @@ -0,0 +1,68 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. +# +# FSQA Test No. 203 +# +# Test subvolume deletion using the subvolume id, even when the subvolume in +# question is in a different mount space. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/filter.btrfs + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_btrfs_command subvolume delete --subvolid + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +_delete_and_list() +{ + local subvol_name="$1" + local msg="$2" + + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch + + echo "$msg" + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' +} + +# Test creating a normal subvolumes +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch + +echo "Current subvolume ids:" +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' + +# Delete the subvolume subvol1, and list the remaining two subvolumes +_delete_and_list subvol1 "After deleting one subvolume:" +_scratch_unmount + +# Now we mount the subvol2, which makes subvol3 not accessible for this mount +# point, but we should be able to delete it using it's subvolume id +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT +_delete_and_list subvol3 "Last remaining subvolume:" +_scratch_unmount + +# now mount the rootfs +_scratch_mount +# Delete the subvol2 +_delete_and_list subvol2 "All subvolumes removed." +_scratch_unmount + +# success, all done +status=0 +exit diff --git a/tests/btrfs/203.out b/tests/btrfs/203.out new file mode 100644 index 00000000..3301852b --- /dev/null +++ b/tests/btrfs/203.out @@ -0,0 +1,17 @@ +QA output created by 203 +Create subvolume 'SCRATCH_MNT/subvol1' +Create subvolume 'SCRATCH_MNT/subvol2' +Create subvolume 'SCRATCH_MNT/subvol3' +Current subvolume ids: +subvol1 +subvol2 +subvol3 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' +After deleting one subvolume: +subvol2 +subvol3 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' +Last remaining subvolume: +subvol2 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' +All subvolumes removed. diff --git a/tests/btrfs/group b/tests/btrfs/group index 79f85e97..e7744217 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -204,3 +204,4 @@ 200 auto quick send clone 201 auto quick punch log 202 auto quick subvol snapshot +203 auto quick subvol -- 2.25.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature 2020-02-24 3:13 ` [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature Marcos Paulo de Souza @ 2020-03-01 13:54 ` Eryu Guan 2020-03-01 17:06 ` Marcos Paulo de Souza 0 siblings, 1 reply; 9+ messages in thread From: Eryu Guan @ 2020-03-01 13:54 UTC (permalink / raw) To: Marcos Paulo de Souza Cc: dsterba, nborisov, linux-btrfs, fstests, Marcos Paulo de Souza On Mon, Feb 24, 2020 at 12:13:41AM -0300, Marcos Paulo de Souza wrote: > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Looks fine to me overall, but it'd be better to have commit message to describe the test. Also, it'd be great if btrfs folks could help review it. Thanks, Eryu > --- > Changes from v2: > * Added 'Created subvolume...' into 203.out to match the subvolume creating command > * Changed awk to $AWK_PROG, suggested by Eryu > * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu > * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu > * Created a local function to delete and list subvolumes, suggested by Eryu > > Changes from v1: > * Added some prints printing what is being tested > * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using > plain integers > > > tests/btrfs/203 | 68 +++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/203.out | 17 ++++++++++++ > tests/btrfs/group | 1 + > 3 files changed, 86 insertions(+) > create mode 100755 tests/btrfs/203 > create mode 100644 tests/btrfs/203.out > > diff --git a/tests/btrfs/203 b/tests/btrfs/203 > new file mode 100755 > index 00000000..0f662db1 > --- /dev/null > +++ b/tests/btrfs/203 > @@ -0,0 +1,68 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. > +# > +# FSQA Test No. 203 > +# > +# Test subvolume deletion using the subvolume id, even when the subvolume in > +# question is in a different mount space. > +# > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > +tmp=/tmp/$$ > +status=1 # failure is the default! > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/filter.btrfs > + > +# real QA test starts here > +_supported_fs btrfs > +_supported_os Linux > +_require_scratch > +_require_btrfs_command subvolume delete --subvolid > + > +_scratch_mkfs > /dev/null 2>&1 > +_scratch_mount > + > +_delete_and_list() > +{ > + local subvol_name="$1" > + local msg="$2" > + > + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") > + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch > + > + echo "$msg" > + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > +} > + > +# Test creating a normal subvolumes > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch > + > +echo "Current subvolume ids:" > +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > + > +# Delete the subvolume subvol1, and list the remaining two subvolumes > +_delete_and_list subvol1 "After deleting one subvolume:" > +_scratch_unmount > + > +# Now we mount the subvol2, which makes subvol3 not accessible for this mount > +# point, but we should be able to delete it using it's subvolume id > +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT > +_delete_and_list subvol3 "Last remaining subvolume:" > +_scratch_unmount > + > +# now mount the rootfs > +_scratch_mount > +# Delete the subvol2 > +_delete_and_list subvol2 "All subvolumes removed." > +_scratch_unmount > + > +# success, all done > +status=0 > +exit > diff --git a/tests/btrfs/203.out b/tests/btrfs/203.out > new file mode 100644 > index 00000000..3301852b > --- /dev/null > +++ b/tests/btrfs/203.out > @@ -0,0 +1,17 @@ > +QA output created by 203 > +Create subvolume 'SCRATCH_MNT/subvol1' > +Create subvolume 'SCRATCH_MNT/subvol2' > +Create subvolume 'SCRATCH_MNT/subvol3' > +Current subvolume ids: > +subvol1 > +subvol2 > +subvol3 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' > +After deleting one subvolume: > +subvol2 > +subvol3 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' > +Last remaining subvolume: > +subvol2 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' > +All subvolumes removed. > diff --git a/tests/btrfs/group b/tests/btrfs/group > index 79f85e97..e7744217 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -204,3 +204,4 @@ > 200 auto quick send clone > 201 auto quick punch log > 202 auto quick subvol snapshot > +203 auto quick subvol > -- > 2.25.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature 2020-03-01 13:54 ` Eryu Guan @ 2020-03-01 17:06 ` Marcos Paulo de Souza 2020-03-08 15:12 ` Eryu Guan 0 siblings, 1 reply; 9+ messages in thread From: Marcos Paulo de Souza @ 2020-03-01 17:06 UTC (permalink / raw) To: Eryu Guan; +Cc: dsterba, nborisov, linux-btrfs, fstests, Marcos Paulo de Souza [-- Attachment #1: Type: text/plain, Size: 5264 bytes --] On Sun, Mar 01, 2020 at 09:54:06PM +0800, Eryu Guan wrote: > On Mon, Feb 24, 2020 at 12:13:41AM -0300, Marcos Paulo de Souza wrote: > > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > > Looks fine to me overall, but it'd be better to have commit message to > describe the test. > > Also, it'd be great if btrfs folks could help review it. Indeed, a commit message makes things better. I'm attaching here a new version of the patch containing a commit message. This new version also bumps the test number from 203 -> 207, since other messages were merged after I sent my patch. While adding the commit message I found in Josef's commit that he added a new btrfs test 206, but groups contained test 204[1]. Is it a typo? [1]: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=1d6d14db1165db1ffc87fbddcf97eb70fdf84607 > > Thanks, > Eryu > > > --- > > Changes from v2: > > * Added 'Created subvolume...' into 203.out to match the subvolume creating command > > * Changed awk to $AWK_PROG, suggested by Eryu > > * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu > > * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu > > * Created a local function to delete and list subvolumes, suggested by Eryu > > > > Changes from v1: > > * Added some prints printing what is being tested > > * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using > > plain integers > > > > > > tests/btrfs/203 | 68 +++++++++++++++++++++++++++++++++++++++++++++ > > tests/btrfs/203.out | 17 ++++++++++++ > > tests/btrfs/group | 1 + > > 3 files changed, 86 insertions(+) > > create mode 100755 tests/btrfs/203 > > create mode 100644 tests/btrfs/203.out > > > > diff --git a/tests/btrfs/203 b/tests/btrfs/203 > > new file mode 100755 > > index 00000000..0f662db1 > > --- /dev/null > > +++ b/tests/btrfs/203 > > @@ -0,0 +1,68 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0 > > +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. > > +# > > +# FSQA Test No. 203 > > +# > > +# Test subvolume deletion using the subvolume id, even when the subvolume in > > +# question is in a different mount space. > > +# > > +seq=`basename $0` > > +seqres=$RESULT_DIR/$seq > > +echo "QA output created by $seq" > > +tmp=/tmp/$$ > > +status=1 # failure is the default! > > + > > +# get standard environment, filters and checks > > +. ./common/rc > > +. ./common/filter > > +. ./common/filter.btrfs > > + > > +# real QA test starts here > > +_supported_fs btrfs > > +_supported_os Linux > > +_require_scratch > > +_require_btrfs_command subvolume delete --subvolid > > + > > +_scratch_mkfs > /dev/null 2>&1 > > +_scratch_mount > > + > > +_delete_and_list() > > +{ > > + local subvol_name="$1" > > + local msg="$2" > > + > > + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") > > + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch > > + > > + echo "$msg" > > + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > > +} > > + > > +# Test creating a normal subvolumes > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch > > + > > +echo "Current subvolume ids:" > > +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > > + > > +# Delete the subvolume subvol1, and list the remaining two subvolumes > > +_delete_and_list subvol1 "After deleting one subvolume:" > > +_scratch_unmount > > + > > +# Now we mount the subvol2, which makes subvol3 not accessible for this mount > > +# point, but we should be able to delete it using it's subvolume id > > +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT > > +_delete_and_list subvol3 "Last remaining subvolume:" > > +_scratch_unmount > > + > > +# now mount the rootfs > > +_scratch_mount > > +# Delete the subvol2 > > +_delete_and_list subvol2 "All subvolumes removed." > > +_scratch_unmount > > + > > +# success, all done > > +status=0 > > +exit > > diff --git a/tests/btrfs/203.out b/tests/btrfs/203.out > > new file mode 100644 > > index 00000000..3301852b > > --- /dev/null > > +++ b/tests/btrfs/203.out > > @@ -0,0 +1,17 @@ > > +QA output created by 203 > > +Create subvolume 'SCRATCH_MNT/subvol1' > > +Create subvolume 'SCRATCH_MNT/subvol2' > > +Create subvolume 'SCRATCH_MNT/subvol3' > > +Current subvolume ids: > > +subvol1 > > +subvol2 > > +subvol3 > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' > > +After deleting one subvolume: > > +subvol2 > > +subvol3 > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' > > +Last remaining subvolume: > > +subvol2 > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' > > +All subvolumes removed. > > diff --git a/tests/btrfs/group b/tests/btrfs/group > > index 79f85e97..e7744217 100644 > > --- a/tests/btrfs/group > > +++ b/tests/btrfs/group > > @@ -204,3 +204,4 @@ > > 200 auto quick send clone > > 201 auto quick punch log > > 202 auto quick subvol snapshot > > +203 auto quick subvol > > -- > > 2.25.0 > > [-- Attachment #2: 0001-btrfs-Test-subvolume-delete-subvolid-feature.patch --] [-- Type: text/x-patch, Size: 4671 bytes --] From 2541e8ef08d45030f97073ef1e5bc9196ef22e4d Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza <mpdesouza@suse.com> Date: Sun, 26 Jan 2020 23:44:22 -0300 Subject: [PATCHv4] btrfs: Test subvolume delete --subvolid feature Now btrfs can delete subvolumes based in ther subvolume id. This makes easy for the user willing to delete a subvolume that cannot be accessed by the mount point, since btrfs allows to mount a specific subvolume and hiding the other from the mount point. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> --- Changes from v3: * Changes test 203 -> 207, since other tests were merged * The first patch was merged, so remove it from sending again [https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=2f9b4039253d3a6f91cb2a22639a243b5a27e110] Changes from v2: * Added Reviewed-by from Nikolay to patch 0001 * Changed awk to $AWK_PROG, suggested by Eryu * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu * Created a local function to delete and list subvolumes, suggested by Eryu Changes from v1: * Added some prints printing what is being tested * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using plain integers * New patch expanding the funtionality of _require_btrfs_command, which now check for argument of subcommands tests/btrfs/207 | 68 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/207.out | 17 ++++++++++++ tests/btrfs/group | 1 + 3 files changed, 86 insertions(+) create mode 100755 tests/btrfs/207 create mode 100644 tests/btrfs/207.out diff --git a/tests/btrfs/207 b/tests/btrfs/207 new file mode 100755 index 00000000..bec5baea --- /dev/null +++ b/tests/btrfs/207 @@ -0,0 +1,68 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. +# +# FSQA Test No. 207 +# +# Test subvolume deletion using the subvolume id, even when the subvolume in +# question is in a different mount space. +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" +tmp=/tmp/$$ +status=1 # failure is the default! + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/filter.btrfs + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_btrfs_command subvolume delete --subvolid + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +_delete_and_list() +{ + local subvol_name="$1" + local msg="$2" + + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch + + echo "$msg" + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' +} + +# Test creating a normal subvolumes +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch + +echo "Current subvolume ids:" +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' + +# Delete the subvolume subvol1, and list the remaining two subvolumes +_delete_and_list subvol1 "After deleting one subvolume:" +_scratch_unmount + +# Now we mount the subvol2, which makes subvol3 not accessible for this mount +# point, but we should be able to delete it using it's subvolume id +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT +_delete_and_list subvol3 "Last remaining subvolume:" +_scratch_unmount + +# now mount the rootfs +_scratch_mount +# Delete the subvol2 +_delete_and_list subvol2 "All subvolumes removed." +_scratch_unmount + +# success, all done +status=0 +exit diff --git a/tests/btrfs/207.out b/tests/btrfs/207.out new file mode 100644 index 00000000..e3f7daa4 --- /dev/null +++ b/tests/btrfs/207.out @@ -0,0 +1,17 @@ +QA output created by 207 +Create subvolume 'SCRATCH_MNT/subvol1' +Create subvolume 'SCRATCH_MNT/subvol2' +Create subvolume 'SCRATCH_MNT/subvol3' +Current subvolume ids: +subvol1 +subvol2 +subvol3 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' +After deleting one subvolume: +subvol2 +subvol3 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' +Last remaining subvolume: +subvol2 +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' +All subvolumes removed. diff --git a/tests/btrfs/group b/tests/btrfs/group index e3ad347b..1acf6af7 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -209,3 +209,4 @@ 204 auto quick punch 205 auto quick clone compress 204 auto quick log replay +207 auto quick subvol -- 2.25.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature 2020-03-01 17:06 ` Marcos Paulo de Souza @ 2020-03-08 15:12 ` Eryu Guan 2020-03-08 15:15 ` Eryu Guan 0 siblings, 1 reply; 9+ messages in thread From: Eryu Guan @ 2020-03-08 15:12 UTC (permalink / raw) To: Marcos Paulo de Souza Cc: dsterba, nborisov, linux-btrfs, fstests, Marcos Paulo de Souza On Sun, Mar 01, 2020 at 02:06:54PM -0300, Marcos Paulo de Souza wrote: > On Sun, Mar 01, 2020 at 09:54:06PM +0800, Eryu Guan wrote: > > On Mon, Feb 24, 2020 at 12:13:41AM -0300, Marcos Paulo de Souza wrote: > > > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > > > > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > > > > Looks fine to me overall, but it'd be better to have commit message to > > describe the test. > > > > Also, it'd be great if btrfs folks could help review it. > > Indeed, a commit message makes things better. I'm attaching here a new version > of the patch containing a commit message. This new version also bumps the test > number from 203 -> 207, since other messages were merged after I sent my patch. Thanks! Would you please send a formal patch to the list? > > While adding the commit message I found in Josef's commit that he added a new > btrfs test 206, but groups contained test 204[1]. Is it a typo? Ah, it is, my bad. This is a merge error and easy enough to fix, I've fixed it in my local tree. Thanks for pointing it out! Thanks, Eryu > > [1]: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=1d6d14db1165db1ffc87fbddcf97eb70fdf84607 > > > > > Thanks, > > Eryu > > > > > --- > > > Changes from v2: > > > * Added 'Created subvolume...' into 203.out to match the subvolume creating command > > > * Changed awk to $AWK_PROG, suggested by Eryu > > > * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu > > > * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu > > > * Created a local function to delete and list subvolumes, suggested by Eryu > > > > > > Changes from v1: > > > * Added some prints printing what is being tested > > > * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using > > > plain integers > > > > > > > > > tests/btrfs/203 | 68 +++++++++++++++++++++++++++++++++++++++++++++ > > > tests/btrfs/203.out | 17 ++++++++++++ > > > tests/btrfs/group | 1 + > > > 3 files changed, 86 insertions(+) > > > create mode 100755 tests/btrfs/203 > > > create mode 100644 tests/btrfs/203.out > > > > > > diff --git a/tests/btrfs/203 b/tests/btrfs/203 > > > new file mode 100755 > > > index 00000000..0f662db1 > > > --- /dev/null > > > +++ b/tests/btrfs/203 > > > @@ -0,0 +1,68 @@ > > > +#! /bin/bash > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. > > > +# > > > +# FSQA Test No. 203 > > > +# > > > +# Test subvolume deletion using the subvolume id, even when the subvolume in > > > +# question is in a different mount space. > > > +# > > > +seq=`basename $0` > > > +seqres=$RESULT_DIR/$seq > > > +echo "QA output created by $seq" > > > +tmp=/tmp/$$ > > > +status=1 # failure is the default! > > > + > > > +# get standard environment, filters and checks > > > +. ./common/rc > > > +. ./common/filter > > > +. ./common/filter.btrfs > > > + > > > +# real QA test starts here > > > +_supported_fs btrfs > > > +_supported_os Linux > > > +_require_scratch > > > +_require_btrfs_command subvolume delete --subvolid > > > + > > > +_scratch_mkfs > /dev/null 2>&1 > > > +_scratch_mount > > > + > > > +_delete_and_list() > > > +{ > > > + local subvol_name="$1" > > > + local msg="$2" > > > + > > > + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") > > > + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch > > > + > > > + echo "$msg" > > > + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > > > +} > > > + > > > +# Test creating a normal subvolumes > > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch > > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch > > > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch > > > + > > > +echo "Current subvolume ids:" > > > +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > > > + > > > +# Delete the subvolume subvol1, and list the remaining two subvolumes > > > +_delete_and_list subvol1 "After deleting one subvolume:" > > > +_scratch_unmount > > > + > > > +# Now we mount the subvol2, which makes subvol3 not accessible for this mount > > > +# point, but we should be able to delete it using it's subvolume id > > > +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT > > > +_delete_and_list subvol3 "Last remaining subvolume:" > > > +_scratch_unmount > > > + > > > +# now mount the rootfs > > > +_scratch_mount > > > +# Delete the subvol2 > > > +_delete_and_list subvol2 "All subvolumes removed." > > > +_scratch_unmount > > > + > > > +# success, all done > > > +status=0 > > > +exit > > > diff --git a/tests/btrfs/203.out b/tests/btrfs/203.out > > > new file mode 100644 > > > index 00000000..3301852b > > > --- /dev/null > > > +++ b/tests/btrfs/203.out > > > @@ -0,0 +1,17 @@ > > > +QA output created by 203 > > > +Create subvolume 'SCRATCH_MNT/subvol1' > > > +Create subvolume 'SCRATCH_MNT/subvol2' > > > +Create subvolume 'SCRATCH_MNT/subvol3' > > > +Current subvolume ids: > > > +subvol1 > > > +subvol2 > > > +subvol3 > > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' > > > +After deleting one subvolume: > > > +subvol2 > > > +subvol3 > > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' > > > +Last remaining subvolume: > > > +subvol2 > > > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' > > > +All subvolumes removed. > > > diff --git a/tests/btrfs/group b/tests/btrfs/group > > > index 79f85e97..e7744217 100644 > > > --- a/tests/btrfs/group > > > +++ b/tests/btrfs/group > > > @@ -204,3 +204,4 @@ > > > 200 auto quick send clone > > > 201 auto quick punch log > > > 202 auto quick subvol snapshot > > > +203 auto quick subvol > > > -- > > > 2.25.0 > > > > From 2541e8ef08d45030f97073ef1e5bc9196ef22e4d Mon Sep 17 00:00:00 2001 > From: Marcos Paulo de Souza <mpdesouza@suse.com> > Date: Sun, 26 Jan 2020 23:44:22 -0300 > Subject: [PATCHv4] btrfs: Test subvolume delete --subvolid feature > > Now btrfs can delete subvolumes based in ther subvolume id. This makes > easy for the user willing to delete a subvolume that cannot be accessed > by the mount point, since btrfs allows to mount a specific subvolume and > hiding the other from the mount point. > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > --- > Changes from v3: > * Changes test 203 -> 207, since other tests were merged > * The first patch was merged, so remove it from sending again > [https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/commit/?id=2f9b4039253d3a6f91cb2a22639a243b5a27e110] > > Changes from v2: > * Added Reviewed-by from Nikolay to patch 0001 > * Changed awk to $AWK_PROG, suggested by Eryu > * Changed _run_btrfs_util_prog to $BTRFS_UTIL_PROG, suggested by Eryu > * Use _scratch_unmount instead of executing umount by hand, sugested by Eryu > * Created a local function to delete and list subvolumes, suggested by Eryu > > Changes from v1: > * Added some prints printing what is being tested > * The test now uses the _btrfs_get_subvolid to get subvolumeids instead of using > plain integers > * New patch expanding the funtionality of _require_btrfs_command, which now > check for argument of subcommands > > tests/btrfs/207 | 68 +++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/207.out | 17 ++++++++++++ > tests/btrfs/group | 1 + > 3 files changed, 86 insertions(+) > create mode 100755 tests/btrfs/207 > create mode 100644 tests/btrfs/207.out > > diff --git a/tests/btrfs/207 b/tests/btrfs/207 > new file mode 100755 > index 00000000..bec5baea > --- /dev/null > +++ b/tests/btrfs/207 > @@ -0,0 +1,68 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (C) 2020 SUSE Linux Products GmbH. All Rights Reserved. > +# > +# FSQA Test No. 207 > +# > +# Test subvolume deletion using the subvolume id, even when the subvolume in > +# question is in a different mount space. > +# > +seq=`basename $0` > +seqres=$RESULT_DIR/$seq > +echo "QA output created by $seq" > +tmp=/tmp/$$ > +status=1 # failure is the default! > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/filter.btrfs > + > +# real QA test starts here > +_supported_fs btrfs > +_supported_os Linux > +_require_scratch > +_require_btrfs_command subvolume delete --subvolid > + > +_scratch_mkfs > /dev/null 2>&1 > +_scratch_mount > + > +_delete_and_list() > +{ > + local subvol_name="$1" > + local msg="$2" > + > + SUBVOLID=$(_btrfs_get_subvolid $SCRATCH_MNT "$subvol_name") > + $BTRFS_UTIL_PROG subvolume delete --subvolid $SUBVOLID $SCRATCH_MNT | _filter_scratch > + > + echo "$msg" > + $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > +} > + > +# Test creating a normal subvolumes > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol1 | _filter_scratch > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol2 | _filter_scratch > +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/subvol3 | _filter_scratch > + > +echo "Current subvolume ids:" > +$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | $AWK_PROG '{ print $NF }' > + > +# Delete the subvolume subvol1, and list the remaining two subvolumes > +_delete_and_list subvol1 "After deleting one subvolume:" > +_scratch_unmount > + > +# Now we mount the subvol2, which makes subvol3 not accessible for this mount > +# point, but we should be able to delete it using it's subvolume id > +$MOUNT_PROG -o subvol=subvol2 $SCRATCH_DEV $SCRATCH_MNT > +_delete_and_list subvol3 "Last remaining subvolume:" > +_scratch_unmount > + > +# now mount the rootfs > +_scratch_mount > +# Delete the subvol2 > +_delete_and_list subvol2 "All subvolumes removed." > +_scratch_unmount > + > +# success, all done > +status=0 > +exit > diff --git a/tests/btrfs/207.out b/tests/btrfs/207.out > new file mode 100644 > index 00000000..e3f7daa4 > --- /dev/null > +++ b/tests/btrfs/207.out > @@ -0,0 +1,17 @@ > +QA output created by 207 > +Create subvolume 'SCRATCH_MNT/subvol1' > +Create subvolume 'SCRATCH_MNT/subvol2' > +Create subvolume 'SCRATCH_MNT/subvol3' > +Current subvolume ids: > +subvol1 > +subvol2 > +subvol3 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1' > +After deleting one subvolume: > +subvol2 > +subvol3 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol3' > +Last remaining subvolume: > +subvol2 > +Delete subvolume (no-commit): 'SCRATCH_MNT/subvol2' > +All subvolumes removed. > diff --git a/tests/btrfs/group b/tests/btrfs/group > index e3ad347b..1acf6af7 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -209,3 +209,4 @@ > 204 auto quick punch > 205 auto quick clone compress > 204 auto quick log replay > +207 auto quick subvol > -- > 2.25.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature 2020-03-08 15:12 ` Eryu Guan @ 2020-03-08 15:15 ` Eryu Guan 0 siblings, 0 replies; 9+ messages in thread From: Eryu Guan @ 2020-03-08 15:15 UTC (permalink / raw) To: Marcos Paulo de Souza Cc: dsterba, nborisov, linux-btrfs, fstests, Marcos Paulo de Souza On Sun, Mar 08, 2020 at 11:13:07PM +0800, Eryu Guan wrote: > On Sun, Mar 01, 2020 at 02:06:54PM -0300, Marcos Paulo de Souza wrote: > > On Sun, Mar 01, 2020 at 09:54:06PM +0800, Eryu Guan wrote: > > > On Mon, Feb 24, 2020 at 12:13:41AM -0300, Marcos Paulo de Souza wrote: > > > > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > > > > > > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> > > > > > > Looks fine to me overall, but it'd be better to have commit message to > > > describe the test. > > > > > > Also, it'd be great if btrfs folks could help review it. > > > > Indeed, a commit message makes things better. I'm attaching here a new version > > of the patch containing a commit message. This new version also bumps the test > > number from 203 -> 207, since other messages were merged after I sent my patch. > > Thanks! Would you please send a formal patch to the list? > > > > > While adding the commit message I found in Josef's commit that he added a new > > btrfs test 206, but groups contained test 204[1]. Is it a typo? > > Ah, it is, my bad. This is a merge error and easy enough to fix, I've > fixed it in my local tree. Thanks for pointing it out! Then I noticed that Omar has fixed it in his new test.. Will drop my local fix. Eryu ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-03-08 15:15 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-24 3:13 [ fstests PATCHv3 0/2] btrfs: Test subvolume delete by id feature Marcos Paulo de Souza 2020-02-24 3:13 ` [ fstests PATCHv3 1/2] common: btrfs: Improve _require_btrfs_command Marcos Paulo de Souza 2020-02-24 19:54 ` Johannes Thumshirn 2020-03-01 13:36 ` Eryu Guan 2020-02-24 3:13 ` [ fstests PATCHv3 2/2] btrfs: Test subvolume delete --subvolid feature Marcos Paulo de Souza 2020-03-01 13:54 ` Eryu Guan 2020-03-01 17:06 ` Marcos Paulo de Souza 2020-03-08 15:12 ` Eryu Guan 2020-03-08 15:15 ` Eryu Guan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).