Skip to contentSkip to conversation

fstests: btrfs/022: Disable snapshot ioctl in fsstress

PATCH In review Qu Wenruo 3 participants 6 messages Feb 6, 2020 – Feb 7, 2020 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 fstests: btrfs/022: Disable snapshot ioctl in fsstress

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

So manually disable snapshot/subvolume creation and deletion ioctl in this test case. Other qgroup test cases aren't affected.

---
 tests/btrfs/022 | 2 ++
 1 file changed, 2 insertions(+)
tests/btrfs/022 +2 -0
index 5348d3ed..d0ae6b01 100755
@@ -43,6 +43,7 @@ _basic_test()
 		$seqres.full 2>&1
 	[ $? -eq 0 ] || _fail "couldn't find our subvols quota group"
 	run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \
+		-f snapshot=0 -f subvol_create=0 -f subvol_delete=0 \
 		$FSSTRESS_AVOID
 	_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/a \
 		$SCRATCH_MNT/b
@@ -66,6 +67,7 @@ _rescan_test()
 	_run_btrfs_util_prog quota enable $SCRATCH_MNT/a
 	subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
 	run_check $FSSTRESS_PROG -d $SCRATCH_MNT/a -w -p 1 -n 2000 \
+		-f snapshot=0 -f subvol_create=0 -f subvol_delete=0 \
 		$FSSTRESS_AVOID
 	sync
 	output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid)
Signature · 1 line
2.23.0
#1 lore raw
Quoted 9 lines · Qu Wenruo

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

So manually disable snapshot/subvolume creation and deletion ioctl in this test case. Other qgroup test cases aren't affected.

Why not just fix _btrfs_get_subvolid? You can use egrep to make sure the name matches exactly. Thanks,

Josef

author
#2 lore raw
Quoted 6 lines · Josef Bacik
Quoted 5 lines · Qu Wenruo

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

Quoted 8 lines
Quoted 5 lines

So manually disable snapshot/subvolume creation and deletion ioctl in this
test case. Other qgroup test cases aren't affected.

Why not just fix _btrfs_get_subvolid?  You can use egrep to make sure the name matches exactly.  Thanks,

Because we have other requirement, like limit tests.

If we have other snapshots/subvolumes, they don't have the same limit, thus unable to test qgroup properly.

Thanks,
Qu

Quoted 2 lines

Josef

#3 lore raw
Quoted 15 lines · Qu Wenruo
Quoted 12 lines · Josef Bacik
Quoted 10 lines · Qu Wenruo

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

So manually disable snapshot/subvolume creation and deletion ioctl in this
test case. Other qgroup test cases aren't affected.

Quoted 8 lines
Quoted 2 lines

Why not just fix _btrfs_get_subvolid?  You can use egrep to make sure the name matches exactly.  Thanks,

Because we have other requirement, like limit tests.

If we have other snapshots/subvolumes, they don't have the same limit, thus unable to test qgroup properly.

That's fair, but we should also fix _btrfs_get_subvolid since we know it doesn't work in this case. Thanks,

Josef

author
#4 lore raw
Quoted 19 lines · Josef Bacik
Quoted 18 lines · Qu Wenruo
Quoted 14 lines · Josef Bacik
Quoted 10 lines · Qu Wenruo

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

So manually disable snapshot/subvolume creation and deletion ioctl in this
test case. Other qgroup test cases aren't affected.

Why not just fix _btrfs_get_subvolid?  You can use egrep to make sure the name matches exactly.  Thanks,

Quoted 8 lines
Quoted 5 lines

Because we have other requirement, like limit tests.

If we have other snapshots/subvolumes, they don't have the same limit, thus unable to test qgroup properly.

That's fair, but we should also fix _btrfs_get_subvolid since we know it doesn't work in this case.  Thanks,

Sure, another patch will address this soon.

Thanks,
Qu

Quoted 2 lines

Josef

#5 lore raw
In reply to Josef Bacik
Quoted 19 lines · Josef Bacik
Quoted 18 lines · Qu Wenruo
Quoted 14 lines · Josef Bacik
Quoted 10 lines · Qu Wenruo

Since commit fd0830929573 ("fsstress: add the ability to create snapshots") adds the ability for fsstress to create/delete snapshot and subvolume, test case btrfs/022 fails as _btrfs_get_subvolid can't handle multiple subvolumes under the same path.

So manually disable snapshot/subvolume creation and deletion ioctl in this
test case. Other qgroup test cases aren't affected.

Why not just fix _btrfs_get_subvolid?  You can use egrep to make sure the name matches exactly.  Thanks,

Quoted 8 lines
Quoted 5 lines

Because we have other requirement, like limit tests.

If we have other snapshots/subvolumes, they don't have the same limit, thus unable to test qgroup properly.

That's fair, but we should also fix _btrfs_get_subvolid since we know it doesn't work in this case.  Thanks,

My bad. It's not the limit test, it doesn't utilize fsstress at all.

It's completely the bad greping for qgroup ids.

We could have the following subvolume layouts in btrfs qgroup show output:
subvol a id=256
subvol b id=306

qgroupid         rfer         excl
--------         ----         ----

0/5 16384 16384
0/256 13914112 16384
...
0/263 3080192 2306048 << 306 matches here first
...
0/306 13914112 16384 << Then match here

Although disabling snapshot/subvolume creation solves the problem since there will be no other subvolumes to start with, we're still not that safe.

The root fix is to grep qgroupid by "0/$subvolid", not just $subvolid.

I'll do a proer fix, and keep the snapshot/subvolume creation to take advantage of your enhanced fsstress.

Thanks,
Qu

Quoted 2 lines

Josef