Skip to contentSkip to conversation

btrfs/298: add test for showing qgroups include staled sorted by path

PATCH In review Sidong Yang 3 participants 3 messages Oct 9, 2023 – Oct 21, 2023 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs/298: add test for showing qgroups include staled sorted by path

Test for showing qgroups include a staled qgroup list sorted by path. It crashed without checking qgroup has empty path. It fixed by the following commit in btrfs-progs:

cd7f1e48 ("btrfs-progs: qgroup: check null in comparing paths")

---
 tests/btrfs/298     | 34 ++++++++++++++++++++++++++++++++++
 tests/btrfs/298.out |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100755 tests/btrfs/298
 create mode 100644 tests/btrfs/298.out
tests/btrfs/298 new file +34 -0
new file mode 100755
index 00000000..5457423d
@@ -0,0 +1,34 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2023 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 298
+#
+# Test that showing qgourps list includes a staled qgroup without crash.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+ . ./common/filter
+
+_supported_fs btrfs
+_require_test
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+
+# Create stale qgroup with creating and deleting a subvolume.
+$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT >> $seqres.full
+$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/a >> $seqres.full
+
+# Show qgroups list with sorting path without crash.
+$BTRFS_UTIL_PROG qgroup show --sort path $SCRATCH_MNT >> $seqres.full
+
+_scratch_unmount
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/298.out new file +2 -0
new file mode 100644
index 00000000..63434267
@@ -0,0 +1,2 @@
+QA output created by 298
+Silence is golden
Signature · 1 line
2.34.1
#1 lore raw
Quoted 5 lines · Sidong Yang

Test for showing qgroups include a staled qgroup list sorted by path. It crashed without checking qgroup has empty path. It fixed by the following commit in btrfs-progs:

cd7f1e48 ("btrfs-progs: qgroup: check null in comparing paths")

This is a progs patch and I'd like to have the test case there, while it does not hurt to have it in the fstests too but IMHO it's not very useful there.

Quoted 33 lines
---
 tests/btrfs/298     | 34 ++++++++++++++++++++++++++++++++++
 tests/btrfs/298.out |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100755 tests/btrfs/298
 create mode 100644 tests/btrfs/298.out
tests/btrfs/298 new file +19 -0
new file mode 100755
index 00000000..5457423d
@@ -0,0 +1,34 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2023 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 298
+#
+# Test that showing qgourps list includes a staled qgroup without crash.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+ . ./common/filter
+
+_supported_fs btrfs
+_require_test
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount

tests/btrfs/298 line 29

Quoted 10 lines
tests/btrfs/298 new file +10 -0
+
+# Create stale qgroup with creating and deleting a subvolume.
+$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT >> $seqres.full
+$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/a >> $seqres.full
+
+# Show qgroups list with sorting path without crash.
+$BTRFS_UTIL_PROG qgroup show --sort path $SCRATCH_MNT >> $seqres.full
+
+_scratch_unmount

I've created a test case for btrfs-progs with the same commands, only using the other wrappers to run them.

Reviewed-by on v1 1/1
#2 lore raw
In reply to Sidong Yang
Quoted 39 lines · Sidong Yang

Test for showing qgroups include a staled qgroup list sorted by path. It crashed without checking qgroup has empty path. It fixed by the following commit in btrfs-progs:

cd7f1e48 ("btrfs-progs: qgroup: check null in comparing paths")

---
 tests/btrfs/298     | 34 ++++++++++++++++++++++++++++++++++
 tests/btrfs/298.out |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100755 tests/btrfs/298
 create mode 100644 tests/btrfs/298.out
tests/btrfs/298 new file +19 -0
new file mode 100755
index 00000000..5457423d
@@ -0,0 +1,34 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2023 Sidong Yang.  All Rights Reserved.
+#
+# FS QA Test 298
+#
+# Test that showing qgourps list includes a staled qgroup without crash.
+#
+. ./common/preamble
+_begin_fstest auto quick qgroup
+
+ . ./common/filter
+
+_supported_fs btrfs
+_require_test
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount

tests/btrfs/298 line 29

Quoted 10 lines
tests/btrfs/298 new file +10 -0
+
+# Create stale qgroup with creating and deleting a subvolume.
+$BTRFS_UTIL_PROG quota enable $SCRATCH_MNT >> $seqres.full
+$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a >> $seqres.full
+$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/a >> $seqres.full
+
+# Show qgroups list with sorting path without crash.
+$BTRFS_UTIL_PROG qgroup show --sort path $SCRATCH_MNT >> $seqres.full
+
+_scratch_unmount

Is the umount a necessary part of this test? If not, this step isn't needed. The SCRATCH_DEV will be unmounted later.

Others looks good to me. I don't mind merging this case, if btrfs list feels good to take time to run it in fstests. If no objection from btrfs, then:

Thanks,
Zorro

Quoted 16 lines
tests/btrfs/298 new file +5 -0
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
tests/btrfs/298.out new file +2 -0
new file mode 100644
index 00000000..63434267
@@ -0,0 +1,2 @@
+QA output created by 298
+Silence is golden
Signature · 1 line
2.34.1