| Message ID | 1425381210-13661-1-git-send-email-yangds.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 03, 2015 at 07:13:30PM +0800, Dongsheng Yang wrote: > This regression is introduced by two commits: > > e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) > 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) I think you should add more description about the issue you're going to test. I see only failures like [root@dhcp-66-86-11 xfstests]# diff -u tests/btrfs/084.out /root/xfstests/results//btrfs/084.out.bad --- tests/btrfs/084.out 2015-03-06 12:47:02.319000000 +0800 +++ /root/xfstests/results//btrfs/084.out.bad 2015-03-06 12:48:03.707000000 +0800 @@ -1,3 +1,3 @@ QA output created by 084 24576 24576 -0 0 +8192 0 but from the test I don't know why "8192 0" is expected result not "0 0" > > Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> > --- > tests/btrfs/084 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/084.out | 3 ++ > tests/btrfs/group | 1 + > 3 files changed, 88 insertions(+) > create mode 100755 tests/btrfs/084 > create mode 100644 tests/btrfs/084.out > > diff --git a/tests/btrfs/084 b/tests/btrfs/084 > new file mode 100755 > index 0000000..7b7c7ac > --- /dev/null > +++ b/tests/btrfs/084 > @@ -0,0 +1,84 @@ > +#! /bin/bash > +# FS QA Test No. 084 > +# > +# This is a case for the regression introduced by > +# > +# e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) > +# 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2015 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.* Better to use a tab not 4 spaces, maybe "new" should be updated too (in another patch) > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > + > +# real QA test starts here > +_need_to_be_root > +_supported_fs btrfs > +_supported_os Linux > +_require_scratch > + > +_scratch_mount _scratch_mkfs first before you mount it. And you need to remove $seqres.full before test, since you called _run_btrfs_util_prog and it will dump commands and outputs to $seqres.full, the file will keep growing over runs if you don't remove it first. rm -f $seqres.full > + > +$XFS_IO_PROG -f -d -c "pwrite 0 8K" $SCRATCH_MNT/foo 2>&1 > /dev/null > + > +_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap > + > +_run_btrfs_util_prog quota enable $SCRATCH_MNT > +_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT > + > +units=`_btrfs_qgroup_units` > +orig_result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` > + > +_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap > + > +_run_btrfs_util_prog filesystem sync $SCRATCH_MNT > + > +timeout=100 > +# There is a background thread doing the clean work > +for ((i=0; i<$timeout; i++)) > +do > + result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` > + if (($orig_result != $result)) > + then > + break > + fi > + sleep 1 I'm not sure if we need 100 iterations and sleeping 1 sec after each iteration, that means we need 100s for a PASS run. > +done Please follow this code style, as Dave pointed before for ; do # code done if ; then # code fi > + > +$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG '/[0-9]/ {print $2" "$3}' > + > +# success, all done > +status=0 > +exit > diff --git a/tests/btrfs/084.out b/tests/btrfs/084.out > new file mode 100644 > index 0000000..7bf6dbf > --- /dev/null > +++ b/tests/btrfs/084.out > @@ -0,0 +1,3 @@ > +QA output created by 084 > +24576 24576 > +0 0 > diff --git a/tests/btrfs/group b/tests/btrfs/group > index fe82a9c..1be7392 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -86,3 +86,4 @@ > 081 auto quick clone > 082 auto quick remount > 083 auto quick send > +084 qgroup Missed auto group? Thanks, Eryu -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Guan, sorry for the late. On 03/06/2015 01:06 PM, Eryu Guan wrote: > On Tue, Mar 03, 2015 at 07:13:30PM +0800, Dongsheng Yang wrote: >> This regression is introduced by two commits: >> >> e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) >> 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) > I think you should add more description about the issue you're going to > test. I see only failures like > > [root@dhcp-66-86-11 xfstests]# diff -u tests/btrfs/084.out /root/xfstests/results//btrfs/084.out.bad > --- tests/btrfs/084.out 2015-03-06 12:47:02.319000000 +0800 > +++ /root/xfstests/results//btrfs/084.out.bad 2015-03-06 > 12:48:03.707000000 +0800 > @@ -1,3 +1,3 @@ > QA output created by 084 > 24576 24576 > -0 0 > +8192 0 > > but from the test I don't know why "8192 0" is expected result not "0 0" Sure, I will add more description in V2 to explain why we are expecting "0 0" here. > >> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> >> --- >> tests/btrfs/084 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ >> tests/btrfs/084.out | 3 ++ >> tests/btrfs/group | 1 + >> 3 files changed, 88 insertions(+) >> create mode 100755 tests/btrfs/084 >> create mode 100644 tests/btrfs/084.out >> >> diff --git a/tests/btrfs/084 b/tests/btrfs/084 >> new file mode 100755 >> index 0000000..7b7c7ac >> --- /dev/null >> +++ b/tests/btrfs/084 >> @@ -0,0 +1,84 @@ >> +#! /bin/bash >> +# FS QA Test No. 084 >> +# >> +# This is a case for the regression introduced by >> +# >> +# e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) >> +# 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) >> +# >> +#----------------------------------------------------------------------- >> +# Copyright (c) 2015 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.* > Better to use a tab not 4 spaces, maybe "new" should be updated too (in > another patch) Thanx, will send another patch for "./new". > >> +} >> + >> +# get standard environment, filters and checks >> +. ./common/rc >> +. ./common/filter >> + >> +# real QA test starts here >> +_need_to_be_root >> +_supported_fs btrfs >> +_supported_os Linux >> +_require_scratch >> + >> +_scratch_mount > _scratch_mkfs first before you mount it. > > And you need to remove $seqres.full before test, since you called > _run_btrfs_util_prog and it will dump commands and outputs to > $seqres.full, the file will keep growing over runs if you don't remove > it first. > > rm -f $seqres.full Great! thanx for your review. > >> + >> +$XFS_IO_PROG -f -d -c "pwrite 0 8K" $SCRATCH_MNT/foo 2>&1 > /dev/null >> + >> +_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap >> + >> +_run_btrfs_util_prog quota enable $SCRATCH_MNT >> +_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT >> + >> +units=`_btrfs_qgroup_units` >> +orig_result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` >> + >> +_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap >> + >> +_run_btrfs_util_prog filesystem sync $SCRATCH_MNT >> + >> +timeout=100 >> +# There is a background thread doing the clean work >> +for ((i=0; i<$timeout; i++)) >> +do >> + result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` >> + if (($orig_result != $result)) >> + then >> + break >> + fi >> + sleep 1 > I'm not sure if we need 100 iterations and sleeping 1 sec after each > iteration, that means we need 100s for a PASS run. The 100sec is the limit for the loop, it means if the clean work is done in 100sec, we will break immediately. We don't have to wait for 100s in each test. > >> +done > Please follow this code style, as Dave pointed before > > for ; do > # code > done > > if ; then > # code > fi Great, >> + >> +$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG '/[0-9]/ {print $2" "$3}' >> + >> +# success, all done >> +status=0 >> +exit >> diff --git a/tests/btrfs/084.out b/tests/btrfs/084.out >> new file mode 100644 >> index 0000000..7bf6dbf >> --- /dev/null >> +++ b/tests/btrfs/084.out >> @@ -0,0 +1,3 @@ >> +QA output created by 084 >> +24576 24576 >> +0 0 >> diff --git a/tests/btrfs/group b/tests/btrfs/group >> index fe82a9c..1be7392 100644 >> --- a/tests/btrfs/group >> +++ b/tests/btrfs/group >> @@ -86,3 +86,4 @@ >> 081 auto quick clone >> 082 auto quick remount >> 083 auto quick send >> +084 qgroup > Missed auto group? Yea, as this is my first test case for fstest, there are lots of silly problems in it. Thanx a lot for your review and help, will update it soon. Thanx Yang > > Thanks, > Eryu > . > -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 16, 2015 at 01:06:52PM +0800, Dongsheng Yang wrote: > Hi Guan, sorry for the late. > > On 03/06/2015 01:06 PM, Eryu Guan wrote: > >On Tue, Mar 03, 2015 at 07:13:30PM +0800, Dongsheng Yang wrote: > >>This regression is introduced by two commits: > >> > >>e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) > >>1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) [snip] > >>+_cleanup() > >>+{ > >>+ cd / > >>+ rm -f $tmp.* > >Better to use a tab not 4 spaces, maybe "new" should be updated too (in > >another patch) > > Thanx, will send another patch for "./new". Just FYI, I've already sent out the fix, please see http://www.spinics.net/lists/fstests/msg01073.html Thanks, Eryu Guan -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/btrfs/084 b/tests/btrfs/084 new file mode 100755 index 0000000..7b7c7ac --- /dev/null +++ b/tests/btrfs/084 @@ -0,0 +1,84 @@ +#! /bin/bash +# FS QA Test No. 084 +# +# This is a case for the regression introduced by +# +# e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) +# 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) +# +#----------------------------------------------------------------------- +# Copyright (c) 2015 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 + +# real QA test starts here +_need_to_be_root +_supported_fs btrfs +_supported_os Linux +_require_scratch + +_scratch_mount + +$XFS_IO_PROG -f -d -c "pwrite 0 8K" $SCRATCH_MNT/foo 2>&1 > /dev/null + +_run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap + +_run_btrfs_util_prog quota enable $SCRATCH_MNT +_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT + +units=`_btrfs_qgroup_units` +orig_result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` + +_run_btrfs_util_prog subvolume delete $SCRATCH_MNT/snap + +_run_btrfs_util_prog filesystem sync $SCRATCH_MNT + +timeout=100 +# There is a background thread doing the clean work +for ((i=0; i<$timeout; i++)) +do + result=`$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG 'NR==NF {print $3}'` + if (($orig_result != $result)) + then + break + fi + sleep 1 +done + +$BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | $AWK_PROG '/[0-9]/ {print $2" "$3}' + +# success, all done +status=0 +exit diff --git a/tests/btrfs/084.out b/tests/btrfs/084.out new file mode 100644 index 0000000..7bf6dbf --- /dev/null +++ b/tests/btrfs/084.out @@ -0,0 +1,3 @@ +QA output created by 084 +24576 24576 +0 0 diff --git a/tests/btrfs/group b/tests/btrfs/group index fe82a9c..1be7392 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -86,3 +86,4 @@ 081 auto quick clone 082 auto quick remount 083 auto quick send +084 qgroup
This regression is introduced by two commits: e339a6b0 (Btrfs: __btrfs_mod_ref should always use no_quota) 1152651a (btrfs: qgroup: account shared subtrees during snapshot delete) Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> --- tests/btrfs/084 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/084.out | 3 ++ tests/btrfs/group | 1 + 3 files changed, 88 insertions(+) create mode 100755 tests/btrfs/084 create mode 100644 tests/btrfs/084.out