Skip to contentSkip to conversation

btrfs: Add new test for qgroup assign functionality

PATCH Superseded Sidong Yang 2 participants 3 messages Sep 24, 2020 Btrfs file system

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 btrfs: Add new test for qgroup assign functionality

This new test will test btrfs's qgroup assign functionality. The test has 3 cases.

- assign, no shared extents
- assign, shared extents
- snapshot -i, shared extents

Each cases create subvolumes and assign qgroup in their own way and check with the command "btrfs check".

Cc Qu Wenruo <[email protected]>
Cc Eryu Guan <[email protected]>

---
v2:
- Create new test and use the cases
v3:
- Fix some minor mistakes
- Make that write some data before assign or snapshot in test
- Put mkfs & mount pair in test function

---
 tests/btrfs/221     | 118 ++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/221.out |   2 +
 tests/btrfs/group   |   1 +
 3 files changed, 121 insertions(+)
 create mode 100755 tests/btrfs/221
 create mode 100644 tests/btrfs/221.out
tests/btrfs/221 new file +118 -0
new file mode 100755
index 00000000..71591765
@@ -0,0 +1,118 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2020 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 221
+#
+# Test the assign functionality of qgroups
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs btrfs
+_supported_os Linux
+
+_require_scratch
+_require_btrfs_qgroup_report
+_require_cp_reflink
+
+# Test assign qgroup for submodule with shared extents by reflink
+assign_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
+
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	cp --reflink=always "$SCRATCH_MNT"/a/file1 "$SCRATCH_MNT"/b/file1
+
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+
+	_scratch_unmount
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test assign qgroup for submodule without shared extents
+assign_no_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign no shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
+
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test snapshot with assigning qgroup for submodule
+snapshot_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup snapshot test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
+	$BTRFS_UTIL_PROG subvolume snapshot -i 0/$subvolid $SCRATCH_MNT/a $SCRATCH_MNT/b >> $seqres.full
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+
+assign_no_shared_test
+
+assign_shared_test
+
+snapshot_test
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/221.out new file +2 -0
new file mode 100644
index 00000000..aa4351cd
@@ -0,0 +1,2 @@
+QA output created by 221
+Silence is golden
tests/btrfs/group +1 -0
index 1b5fa695..cdda38f3 100644
@@ -222,3 +222,4 @@
 218 auto quick volume
 219 auto quick volume
 220 auto quick
+221 auto quick qgroup
Signature · 1 line
2.25.1
#1 lore raw
Quoted 7 lines · Sidong Yang

This new test will test btrfs's qgroup assign functionality. The test has 3 cases.

- assign, no shared extents
- assign, shared extents
- snapshot -i, shared extents

Quoted 7 lines

Each cases create subvolumes and assign qgroup in their own way and check with the command "btrfs check".

Cc Qu Wenruo <[email protected]>
Cc Eryu Guan <[email protected]>

This version is much better overall.

The remaining small problems are mostly fstests related then.
...

Quoted 12 lines
tests/btrfs/221 new file +12 -0
+# Test assign qgroup for submodule with shared extents by reflink
+assign_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full

tests/btrfs/221 line 63

Quoted 10 lines
tests/btrfs/221 new file +10 -0
+
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	cp --reflink=always "$SCRATCH_MNT"/a/file1 "$SCRATCH_MNT"/b/file1
+
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+
+	_scratch_unmount
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1

We have _check_scratch_fs() function to do it properly already.

tests/btrfs/221 line 74

Quoted 11 lines
tests/btrfs/221 new file +11 -0
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test assign qgroup for submodule without shared extents
+assign_no_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign no shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT

It's recommended to call "quota rescan -w" to ensure we finished rescan.

As fast enough system can go to next command before the auto rescan even finished.

Not sure if Eryu would have extra comments.

Thanks,
Qu

Quoted 62 lines
tests/btrfs/221 new file +44 -0
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
+
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test snapshot with assigning qgroup for submodule
+snapshot_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup snapshot test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
+	$BTRFS_UTIL_PROG subvolume snapshot -i 0/$subvolid $SCRATCH_MNT/a $SCRATCH_MNT/b >> $seqres.full
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+
+assign_no_shared_test
+
+assign_shared_test
+
+snapshot_test
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/221.out new file +2 -0
new file mode 100644
index 00000000..aa4351cd
@@ -0,0 +1,2 @@
+QA output created by 221
+Silence is golden
tests/btrfs/group +1 -0
index 1b5fa695..cdda38f3 100644
@@ -222,3 +222,4 @@
 218 auto quick volume
 219 auto quick volume
 220 auto quick
+221 auto quick qgroup
#2 lore raw
Quoted 13 lines · Qu Wenruo
Quoted 10 lines · Sidong Yang

This new test will test btrfs's qgroup assign functionality. The test has 3 cases.

- assign, no shared extents
- assign, shared extents
- snapshot -i, shared extents

Each cases create subvolumes and assign qgroup in their own way and check with the command "btrfs check".

Quoted 6 lines
Quoted 4 lines
Cc Qu Wenruo <[email protected]>
Cc Eryu Guan <[email protected]>

This version is much better overall.

Thanks to you.

Quoted 19 lines

The remaining small problems are mostly fstests related then.
...

Quoted 16 lines
tests/btrfs/221 new file +16 -0
+# Test assign qgroup for submodule with shared extents by reflink
+assign_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
+
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	cp --reflink=always "$SCRATCH_MNT"/a/file1 "$SCRATCH_MNT"/b/file1
+
Quoted 8 lines

tests/btrfs/221 line 63

Quoted 6 lines
tests/btrfs/221 new file +6 -0
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+
+	_scratch_unmount
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1

We have _check_scratch_fs() function to do it properly already.

Okay!

Quoted 15 lines

tests/btrfs/221 line 74

Quoted 12 lines
tests/btrfs/221 new file +11 -0
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test assign qgroup for submodule without shared extents
+assign_no_shared_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup assign no shared test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT

It's recommended to call "quota rescan -w" to ensure we finished rescan.

Quoted 2 lines

As fast enough system can go to next command before the auto rescan even finished.

Yeah, I need to call "quota rescan -w" after enabling quota.

Quoted 2 lines

Not sure if Eryu would have extra comments.

I'm continuously ccing Eryu.
I'll write a new v4 patch.

Thanks!
Sidong

Quoted 67 lines

Thanks,
Qu

Quoted 62 lines
tests/btrfs/221 new file +44 -0
+	$BTRFS_UTIL_PROG qgroup create 1/100 $SCRATCH_MNT
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/b >> $seqres.full
+
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/a 1/100 $SCRATCH_MNT
+	$BTRFS_UTIL_PROG qgroup assign $SCRATCH_MNT/b 1/100 $SCRATCH_MNT
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+# Test snapshot with assigning qgroup for submodule
+snapshot_test()
+{
+	_scratch_mkfs > /dev/null 2>&1
+	_scratch_mount
+
+	echo "=== qgroup snapshot test ===" >> $seqres.full
+	$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT
+	$BTRFS_UTIL_PROG quota rescan -w $SCRATCH_MNT >> $seqres.full
+
+	$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+	_ddt of="$SCRATCH_MNT"/a/file1 bs=1M count=1 >> $seqres.full 2>&1
+	subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
+	$BTRFS_UTIL_PROG subvolume snapshot -i 0/$subvolid $SCRATCH_MNT/a $SCRATCH_MNT/b >> $seqres.full
+	_scratch_unmount
+
+	$BTRFS_UTIL_PROG check $SCRATCH_DEV >> $seqres.full 2>&1
+	[ $? -eq 0 ] || _fail "btrfs check failed"
+}
+
+
+assign_no_shared_test
+
+assign_shared_test
+
+snapshot_test
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/221.out new file +2 -0
new file mode 100644
index 00000000..aa4351cd
@@ -0,0 +1,2 @@
+QA output created by 221
+Silence is golden
tests/btrfs/group +1 -0
index 1b5fa695..cdda38f3 100644
@@ -222,3 +222,4 @@
 218 auto quick volume
 219 auto quick volume
 220 auto quick
+221 auto quick qgroup