diff mbox

[v2,3/3] xfstests/btrfs: add stress test for btrfs quota operations

Message ID 1394423051-17356-3-git-send-email-wangsl.fnst@cn.fujitsu.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Wang Shilong March 10, 2014, 3:44 a.m. UTC
So this is a stress test for btrfs quota operations. it can also
detect the following commit fixed problem:

4082bd3d73(Btrfs: fix oops when writting dirty qgroups to disk)

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
---
v1->v2:
	switch into new helper _run_btrfs_util_prog()
---
 tests/btrfs/043     | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/043.out |  2 ++
 tests/btrfs/group   |  1 +
 3 files changed, 79 insertions(+)
 create mode 100755 tests/btrfs/043
 create mode 100644 tests/btrfs/043.out

Comments

Josef Bacik March 10, 2014, 7:48 p.m. UTC | #1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/09/2014 11:44 PM, Wang Shilong wrote:
> So this is a stress test for btrfs quota operations. it can also 
> detect the following commit fixed problem:
> 
> 4082bd3d73(Btrfs: fix oops when writting dirty qgroups to disk)
> 
> Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> --- 
> v1->v2: switch into new helper _run_btrfs_util_prog() --- 
> tests/btrfs/043     | 76
> +++++++++++++++++++++++++++++++++++++++++++++++++++++ 
> tests/btrfs/043.out |  2 ++ tests/btrfs/group   |  1 + 3 files
> changed, 79 insertions(+) create mode 100755 tests/btrfs/043 create
> mode 100644 tests/btrfs/043.out
> 
> diff --git a/tests/btrfs/043 b/tests/btrfs/043 new file mode
> 100755 index 0000000..d6c4bf3 --- /dev/null +++ b/tests/btrfs/043 
> @@ -0,0 +1,76 @@ +#! /bin/bash +# FS QA Test No. 043 +# +#
> stresstest for btrfs quota operations. we run fsstress and quota +#
> operations concurrently. +# 
> +#-----------------------------------------------------------------------
>
> 
+# Copyright (c) 2014 Fujitsu.  All Rights Reserved.
> +# +# This program is free software; you can redistribute it
> and/or +# modify it under the terms of the GNU General Public
> License as +# published by the Free Software Foundation. +# +# This
> program is distributed in the hope that it would be useful, +# but
> WITHOUT ANY WARRANTY; without even the implied warranty of +#
> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +#
> GNU General Public License for more details. +# +# You should have
> received a copy of the GNU General Public License +# along with
> this program; if not, write the Free Software Foundation, +# Inc.,
> 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
> +#-----------------------------------------------------------------------
>
> 
+#
> + +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 
> + +_supported_fs btrfs +_supported_os Linux +_require_scratch + +rm
> -f $seqres.full + +_quota_enabled_background() +{ +	i=1 +	while [
> $i -le 5 ] +	do +		_run_btrfs_util_prog quota enable $SCRATCH_MNT +
> _run_btrfs_util_prog quota disable $SCRATCH_MNT +		i=$(($i+1)) +
> sleep 1 +	done +} + +MKFS_SIZE=$((1024 * 1024 * 1024)) +run_check
> _scratch_mkfs_sized $MKFS_SIZE +run_check _scratch_mount + 
> +_quota_enabled_background & +run_check $FSSTRESS_PROG -d
> $SCRATCH_MNT -w -p 5 -n 1000 \ +	$FSSTRESS_AVOID + +run_check
> _scratch_unmount +_check_scratch_fs +

You should probably be doing something to make sure the background
quota stuff exits properly before your script exits, my fio box can
run the fsstress in way less than 5 seconds.  Thanks,

Josef

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJTHhcbAAoJEANb+wAKly3B5Y0P/3z2IPMHDb95QwtmK0Ehsy8G
meD44ew0yy8f4hMED5VAnHeKEctRfNierXz+pJAKlxvREzbNKIlnTSDLgwYxMCeO
OQruW1Dp6W4WtSNltF8YfIVZqhLksHpkoW7zYrSr+qCZeQsNal61rjqQ2cydWb4u
nCnICJa/KkLT84MW4WrZU+S2RJE7kvfqQoZkXND4rH2Nw9hAaAnF6bK4+ZfvKwni
uDrBl3vdrQWIps304zIGaYxpnheIskeVdEG2AtL/KsCpCuSI/m/yjFsU8w/yTJ64
g4Kbd9l3sTNSfErujeBZ9brEpVRwslUzSnw0u5g5PNABRYsTcnyh+tkelCIMH8MI
2StpONvNXLQeaL2N378/syV4oWvAez6qUtFVFHTCfjKlugxn92juJXQKaS98K4Un
V1+CrJ6cH2bGLjOKVnDsIf8aY77hSuP6Qn/wNMcZvO10ajlpRhFS9FYy12jyoC7M
1aSLX+6R9pk+MvCwFAS+9w2hYTj5ksDhVZWXIwPxK9rQE/NYitNrv+y6QzcF0xhi
udgTPl5XDdtiDWcDabMHEr6ky5gbnz6oiLcRy4V/XHbr9ymInaiB7fhBJ0DOX78m
I19DBe/QIPCGBwFcgKHmadZAudihory6UzMaMkFlzbt4AVjBEYujS7U4LDhFN0lx
UYXoSJdzjA2OZWhUXfdL
=jTbe
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dave Chinner March 13, 2014, 3:12 a.m. UTC | #2
On Mon, Mar 10, 2014 at 03:48:43PM -0400, Josef Bacik wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 03/09/2014 11:44 PM, Wang Shilong wrote:
> > So this is a stress test for btrfs quota operations. it can also 
> > detect the following commit fixed problem:
> > 
> > 4082bd3d73(Btrfs: fix oops when writting dirty qgroups to disk)
> > 
> > Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> --- 
> > v1->v2: switch into new helper _run_btrfs_util_prog() --- 
> > tests/btrfs/043     | 76
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++ 
> > tests/btrfs/043.out |  2 ++ tests/btrfs/group   |  1 + 3 files
> > changed, 79 insertions(+) create mode 100755 tests/btrfs/043 create
> > mode 100644 tests/btrfs/043.out
> > 
> > diff --git a/tests/btrfs/043 b/tests/btrfs/043 new file mode
> > 100755 index 0000000..d6c4bf3 --- /dev/null +++ b/tests/btrfs/043 
> > @@ -0,0 +1,76 @@ +#! /bin/bash +# FS QA Test No. 043 +# +#
> > stresstest for btrfs quota operations. we run fsstress and quota +#
> > operations concurrently. +# 
> > +#-----------------------------------------------------------------------
> >
> > 
> +# Copyright (c) 2014 Fujitsu.  All Rights Reserved.
> > +# +# This program is free software; you can redistribute it
> > and/or +# modify it under the terms of the GNU General Public
> > License as +# published by the Free Software Foundation. +# +# This
> > program is distributed in the hope that it would be useful, +# but
> > WITHOUT ANY WARRANTY; without even the implied warranty of +#
> > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +#
> > GNU General Public License for more details. +# +# You should have
> > received a copy of the GNU General Public License +# along with
> > this program; if not, write the Free Software Foundation, +# Inc.,
> > 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
> > +#-----------------------------------------------------------------------
> >
> > 
> +#
> > + +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 
> > + +_supported_fs btrfs +_supported_os Linux +_require_scratch + +rm
> > -f $seqres.full + +_quota_enabled_background() +{ +	i=1 +	while [
> > $i -le 5 ] +	do +		_run_btrfs_util_prog quota enable $SCRATCH_MNT +
> > _run_btrfs_util_prog quota disable $SCRATCH_MNT +		i=$(($i+1)) +
> > sleep 1 +	done +} + +MKFS_SIZE=$((1024 * 1024 * 1024)) +run_check
> > _scratch_mkfs_sized $MKFS_SIZE +run_check _scratch_mount + 
> > +_quota_enabled_background & +run_check $FSSTRESS_PROG -d
> > $SCRATCH_MNT -w -p 5 -n 1000 \ +	$FSSTRESS_AVOID + +run_check
> > _scratch_unmount +_check_scratch_fs +
> 
> You should probably be doing something to make sure the background
> quota stuff exits properly before your script exits, my fio box can
> run the fsstress in way less than 5 seconds.  Thanks,

josef - you might want to have a look at what your mailer is doing
to quoted email ad fix it... ;)

Cheers,

Dave.
Josef Bacik March 13, 2014, 2:02 p.m. UTC | #3
On 03/12/2014 11:12 PM, Dave Chinner wrote:
> On Mon, Mar 10, 2014 at 03:48:43PM -0400, Josef Bacik wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 03/09/2014 11:44 PM, Wang Shilong wrote:
>>> So this is a stress test for btrfs quota operations. it can also 
>>> detect the following commit fixed problem:
>>>
>>> 4082bd3d73(Btrfs: fix oops when writting dirty qgroups to disk)
>>>
>>> Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com> --- 
>>> v1->v2: switch into new helper _run_btrfs_util_prog() --- 
>>> tests/btrfs/043     | 76
>>> +++++++++++++++++++++++++++++++++++++++++++++++++++++ 
>>> tests/btrfs/043.out |  2 ++ tests/btrfs/group   |  1 + 3 files
>>> changed, 79 insertions(+) create mode 100755 tests/btrfs/043 create
>>> mode 100644 tests/btrfs/043.out
>>>
>>> diff --git a/tests/btrfs/043 b/tests/btrfs/043 new file mode
>>> 100755 index 0000000..d6c4bf3 --- /dev/null +++ b/tests/btrfs/043 
>>> @@ -0,0 +1,76 @@ +#! /bin/bash +# FS QA Test No. 043 +# +#
>>> stresstest for btrfs quota operations. we run fsstress and quota +#
>>> operations concurrently. +# 
>>> +#-----------------------------------------------------------------------
>>>
>>>
>> +# Copyright (c) 2014 Fujitsu.  All Rights Reserved.
>>> +# +# This program is free software; you can redistribute it
>>> and/or +# modify it under the terms of the GNU General Public
>>> License as +# published by the Free Software Foundation. +# +# This
>>> program is distributed in the hope that it would be useful, +# but
>>> WITHOUT ANY WARRANTY; without even the implied warranty of +#
>>> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +#
>>> GNU General Public License for more details. +# +# You should have
>>> received a copy of the GNU General Public License +# along with
>>> this program; if not, write the Free Software Foundation, +# Inc.,
>>> 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
>>> +#-----------------------------------------------------------------------
>>>
>>>
>> +#
>>> + +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 
>>> + +_supported_fs btrfs +_supported_os Linux +_require_scratch + +rm
>>> -f $seqres.full + +_quota_enabled_background() +{ +	i=1 +	while [
>>> $i -le 5 ] +	do +		_run_btrfs_util_prog quota enable $SCRATCH_MNT +
>>> _run_btrfs_util_prog quota disable $SCRATCH_MNT +		i=$(($i+1)) +
>>> sleep 1 +	done +} + +MKFS_SIZE=$((1024 * 1024 * 1024)) +run_check
>>> _scratch_mkfs_sized $MKFS_SIZE +run_check _scratch_mount + 
>>> +_quota_enabled_background & +run_check $FSSTRESS_PROG -d
>>> $SCRATCH_MNT -w -p 5 -n 1000 \ +	$FSSTRESS_AVOID + +run_check
>>> _scratch_unmount +_check_scratch_fs +
>>
>> You should probably be doing something to make sure the background
>> quota stuff exits properly before your script exits, my fio box can
>> run the fsstress in way less than 5 seconds.  Thanks,
> 
> josef - you might want to have a look at what your mailer is doing
> to quoted email ad fix it... ;)

Eesh I think it's enigmail, I'll turn it off.  Thanks,

Josef

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/tests/btrfs/043 b/tests/btrfs/043
new file mode 100755
index 0000000..d6c4bf3
--- /dev/null
+++ b/tests/btrfs/043
@@ -0,0 +1,76 @@ 
+#! /bin/bash
+# FS QA Test No. 043
+#
+# stresstest for btrfs quota operations. we run fsstress and quota
+# operations concurrently.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2014 Fujitsu.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+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
+
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+
+rm -f $seqres.full
+
+_quota_enabled_background()
+{
+	i=1
+	while [ $i -le 5 ]
+	do
+		_run_btrfs_util_prog quota enable $SCRATCH_MNT
+		_run_btrfs_util_prog quota disable $SCRATCH_MNT
+		i=$(($i+1))
+		sleep 1
+	done
+}
+
+MKFS_SIZE=$((1024 * 1024 * 1024))
+run_check _scratch_mkfs_sized $MKFS_SIZE
+run_check _scratch_mount
+
+_quota_enabled_background &
+run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p 5 -n 1000 \
+	$FSSTRESS_AVOID
+
+run_check _scratch_unmount
+_check_scratch_fs
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/043.out b/tests/btrfs/043.out
new file mode 100644
index 0000000..f90f0a5
--- /dev/null
+++ b/tests/btrfs/043.out
@@ -0,0 +1,2 @@ 
+QA output created by 043
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 1037761..fabe3b5 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -45,3 +45,4 @@ 
 040 auto quick
 041 auto quick
 042 auto quick
+043 auto quick