From: Josef Bacik <josef@xxxxxxxxxxxxxx>
btrfs/022 currently fails if you are testing with -o compress because it
does a limit exceed test which will pass with compression on.
However the other functionality this test tests is completely acceptable
with compression enabled. Handle this by breaking the test into two
tests, one that simply tests the qgroup exceed limits test that requires
no compression, and the rest of the tests that do not have the no
compression restriction.
Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
---
tests/btrfs/022 | 86 ++---------------------------------
tests/btrfs/400 | 107 ++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/400.out | 2 +
3 files changed, 112 insertions(+), 83 deletions(-)
create mode 100755 tests/btrfs/400
create mode 100644 tests/btrfs/400.out
diff --git a/tests/btrfs/022 b/tests/btrfs/022
index b1ef2fdf787640..32ad80bf9c64e8 100755
--- a/tests/btrfs/022
+++ b/tests/btrfs/022
@@ -4,7 +4,7 @@
#
# FS QA Test No. 022
#
-# Test the basic functionality of qgroups
+# Test the basic qgroup exceed case
#
. ./common/preamble
_begin_fstest auto qgroup limit
@@ -17,59 +17,8 @@ _require_scratch
_require_qgroup_rescan
_require_btrfs_qgroup_report
-# Test to make sure we can actually turn it on and it makes sense
-_basic_test()
-{
- echo "=== basic test ===" >> $seqres.full
- _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
- _run_btrfs_util_prog quota enable $SCRATCH_MNT/a
- _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
- subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
- $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid >> \
- $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 \
- $FSSTRESS_AVOID
- _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/a \
- $SCRATCH_MNT/b
-
- # the shared values of both the original subvol and snapshot should
- # match
- a_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
- a_shared=$(echo $a_shared | $AWK_PROG '{ print $2 }')
- echo "subvol a id=$subvolid" >> $seqres.full
- subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT b)
- echo "subvol b id=$subvolid" >> $seqres.full
- b_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
- b_shared=$(echo $b_shared | $AWK_PROG '{ print $2 }')
- $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT >> $seqres.full
- [ $b_shared -eq $a_shared ] || _fail "shared values don't match"
-}
-
-#enable quotas, do some work, check our values and then rescan and make sure we
-#come up with the same answer
-_rescan_test()
-{
- echo "=== rescan test ===" >> $seqres.full
- # first with a blank subvol
- _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
- _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 \
- $FSSTRESS_AVOID
- sync
- output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
- echo "qgroup values before rescan: $output" >> $seqres.full
- refer=$(echo $output | $AWK_PROG '{ print $2 }')
- excl=$(echo $output | $AWK_PROG '{ print $3 }')
- _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
- output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
- echo "qgroup values after rescan: $output" >> $seqres.full
- [ $refer -eq $(echo $output | $AWK_PROG '{ print $2 }') ] || \
- _fail "reference values don't match after rescan"
- [ $excl -eq $(echo $output | $AWK_PROG '{ print $3 }') ] || \
- _fail "exclusive values don't match after rescan"
-}
+# This test requires specific data usage, skip if we have compression enabled
+_require_no_compress
#basic exceed limit testing
_limit_test_exceed()
@@ -82,43 +31,14 @@ _limit_test_exceed()
_ddt of=$SCRATCH_MNT/a/file bs=10M count=1 >> $seqres.full 2>&1
[ $? -ne 0 ] || _fail "quota should have limited us"
}
-
-#basic noexceed limit testing
-_limit_test_noexceed()
-{
- echo "=== limit not exceed test ===" >> $seqres.full
- _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
- _run_btrfs_util_prog quota enable $SCRATCH_MNT
- subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
- _run_btrfs_util_prog qgroup limit 5M 0/$subvolid $SCRATCH_MNT
- _ddt of=$SCRATCH_MNT/a/file bs=4M count=1 >> $seqres.full 2>&1
- [ $? -eq 0 ] || _fail "should have been allowed to write"
-}
-
units=`_btrfs_qgroup_units`
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount
-_basic_test
-_scratch_unmount
-_check_scratch_fs
-
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount
-_rescan_test
-_scratch_unmount
-_check_scratch_fs
-
_scratch_mkfs > /dev/null 2>&1
_scratch_mount
_limit_test_exceed
_scratch_unmount
_check_scratch_fs
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount
-_limit_test_noexceed
-
# success, all done
echo "Silence is golden"
status=0
diff --git a/tests/btrfs/400 b/tests/btrfs/400
new file mode 100755
index 00000000000000..ad0363fb72d186
--- /dev/null
+++ b/tests/btrfs/400
@@ -0,0 +1,107 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2021 Facebook. All Rights Reserved.
+#
+# FS QA Test No. 400
+#
+# Test qgroups to validate the creation works, the counters are sane, rescan
+# works, and we do not get failures when we write less than the limit amount.
+#
+. ./common/preamble
+_begin_fstest auto qgroup limit
+
+# Import common functions.
+. ./common/filter
+
+_supported_fs btrfs
+_require_scratch
+_require_btrfs_qgroup_report
+
+# Test to make sure we can actually turn it on and it makes sense
+_basic_test()
+{
+ echo "=== basic test ===" >> $seqres.full
+ _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
+ _run_btrfs_util_prog quota enable $SCRATCH_MNT/a
+ _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+ subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
+ $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid >> \
+ $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 \
+ $FSSTRESS_AVOID
+ _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT/a \
+ $SCRATCH_MNT/b
+
+ # the shared values of both the original subvol and snapshot should
+ # match
+ a_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
+ a_shared=$(echo $a_shared | $AWK_PROG '{ print $2 }')
+ echo "subvol a id=$subvolid" >> $seqres.full
+ subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT b)
+ echo "subvol b id=$subvolid" >> $seqres.full
+ b_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
+ b_shared=$(echo $b_shared | $AWK_PROG '{ print $2 }')
+ $BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT >> $seqres.full
+ [ $b_shared -eq $a_shared ] || _fail "shared values don't match"
+}
+
+#enable quotas, do some work, check our values and then rescan and make sure we
+#come up with the same answer
+_rescan_test()
+{
+ echo "=== rescan test ===" >> $seqres.full
+ # first with a blank subvol
+ _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
+ _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 \
+ $FSSTRESS_AVOID
+ sync
+ output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
+ echo "qgroup values before rescan: $output" >> $seqres.full
+ refer=$(echo $output | $AWK_PROG '{ print $2 }')
+ excl=$(echo $output | $AWK_PROG '{ print $3 }')
+ _run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
+ output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
+ echo "qgroup values after rescan: $output" >> $seqres.full
+ [ $refer -eq $(echo $output | $AWK_PROG '{ print $2 }') ] || \
+ _fail "reference values don't match after rescan"
+ [ $excl -eq $(echo $output | $AWK_PROG '{ print $3 }') ] || \
+ _fail "exclusive values don't match after rescan"
+}
+
+#basic noexceed limit testing
+_limit_test_noexceed()
+{
+ echo "=== limit not exceed test ===" >> $seqres.full
+ _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a
+ _run_btrfs_util_prog quota enable $SCRATCH_MNT
+ subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT a)
+ _run_btrfs_util_prog qgroup limit 5M 0/$subvolid $SCRATCH_MNT
+ _ddt of=$SCRATCH_MNT/a/file bs=4M count=1 >> $seqres.full 2>&1
+ [ $? -eq 0 ] || _fail "should have been allowed to write"
+}
+
+units=`_btrfs_qgroup_units`
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+_basic_test
+_scratch_unmount
+_check_scratch_fs
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+_rescan_test
+_scratch_unmount
+_check_scratch_fs
+
+_scratch_mkfs > /dev/null 2>&1
+_scratch_mount
+_limit_test_noexceed
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/400.out b/tests/btrfs/400.out
new file mode 100644
index 00000000000000..c940c6206bcd81
--- /dev/null
+++ b/tests/btrfs/400.out
@@ -0,0 +1,2 @@
+QA output created by 400
+Silence is golden
--
2.42.1
