From: Qu Wenruo <wqu@suse.com>
To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org
Cc: Josef Bacik <josef@toxicpanda.com>
Subject: [PATCH 2/3] fstests: btrfs/022: Match qgroup id more correctly
Date: Fri, 7 Feb 2020 09:59:41 +0800 [thread overview]
Message-ID: <20200207015942.9079-3-wqu@suse.com> (raw)
In-Reply-To: <20200207015942.9079-1-wqu@suse.com>
[BUG]
Btrfs/022 sometimes fails with snapshot's reference mismatch with its
source.
[CAUSE]
Since commit fd0830929573 ("fsstress: add the ability to create
snapshots") adds the ability for fsstress to create/delete snapshot and
subvolumes, fsstress will create new subvolumes under test dir.
For example, we could have the following subvolumes created by fsstress:
subvol a id=256
subvol b id=306
qgroupid rfer excl
-------- ---- ----
0/5 16384 16384
0/256 13914112 16384
...
0/263 3080192 2306048 << 2 *306* 048
...
0/306 13914112 16384 << 0/ *306
So when we're greping for subvolid 306, it matches qgroup 0/263 first,
which has difference size, and caused false alert.
[FIX]
Instead of greping "$subvolid" blindly, now grep "0/$subvolid" to catch
qgroupid correctly, without hitting rfer/excl values.
Suggested-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
tests/btrfs/022 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/btrfs/022 b/tests/btrfs/022
index 5348d3ed..3e729852 100755
--- a/tests/btrfs/022
+++ b/tests/btrfs/022
@@ -49,10 +49,10 @@ _basic_test()
# the shared values of both the original subvol and snapshot should
# match
- a_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid)
+ a_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
a_shared=$(echo $a_shared | awk '{ print $2 }')
subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT b)
- b_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid)
+ b_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
b_shared=$(echo $b_shared | awk '{ print $2 }')
[ $b_shared -eq $a_shared ] || _fail "shared values don't match"
}
@@ -68,12 +68,12 @@ _rescan_test()
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 $subvolid)
+ output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
echo $output >> $seqres.full
refer=$(echo $output | awk '{ print $2 }')
excl=$(echo $output | awk '{ print $3 }')
_run_btrfs_util_prog quota rescan -w $SCRATCH_MNT
- output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep $subvolid)
+ output=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid")
echo $output >> $seqres.full
[ $refer -eq $(echo $output | awk '{ print $2 }') ] || \
_fail "reference values don't match after rescan"
--
2.23.0
next prev parent reply other threads:[~2020-02-07 1:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 1:59 [PATCH 0/3] fstests: btrfs/022 fixes Qu Wenruo
2020-02-07 1:59 ` [PATCH 1/3] fstests: btrfs: Use word mathcing for _btrfs_get_subvolid() Qu Wenruo
2020-02-07 2:09 ` Josef Bacik
2020-02-07 9:41 ` Nikolay Borisov
2020-02-07 10:02 ` Qu Wenruo
2020-02-07 11:07 ` Nikolay Borisov
2020-02-07 1:59 ` Qu Wenruo [this message]
2020-02-07 2:10 ` [PATCH 2/3] fstests: btrfs/022: Match qgroup id more correctly Josef Bacik
2020-02-07 9:46 ` Nikolay Borisov
2020-02-07 10:03 ` Qu Wenruo
2020-02-07 1:59 ` [PATCH 3/3] fstests: btrfs/022: Add debug output Qu Wenruo
2020-02-07 2:10 ` Josef Bacik
2020-02-07 9:48 ` Nikolay Borisov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200207015942.9079-3-wqu@suse.com \
--to=wqu@suse.com \
--cc=fstests@vger.kernel.org \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).