From: David Disseldorp <ddiss@suse.de>
To: fstests@vger.kernel.org
Cc: Qu Wenruo <wqu@suse.com>, David Disseldorp <ddiss@suse.de>
Subject: [PATCH 2/5] btrfs/282: append scrub status output to 282.full
Date: Thu, 7 Dec 2023 18:20:53 +1100 [thread overview]
Message-ID: <20231207072056.14588-3-ddiss@suse.de> (raw)
In-Reply-To: <20231207072056.14588-1-ddiss@suse.de>
Also, collapse the grep/cut usage into the existing awk one-liner.
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
tests/btrfs/282 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/btrfs/282 b/tests/btrfs/282
index 395e0626..66d14f82 100755
--- a/tests/btrfs/282
+++ b/tests/btrfs/282
@@ -60,8 +60,9 @@ $BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >> $seqres.full
# Error summary: no errors found
#
# What we care is that Rate line.
-init_speed=$($BTRFS_UTIL_PROG scrub status --raw $SCRATCH_MNT | grep "Rate:" |\
- $AWK_PROG '{print $2}' | cut -f1 -d\/)
+init_speed=$($BTRFS_UTIL_PROG scrub status --raw $SCRATCH_MNT |\
+ tee -a $seqres.full |\
+ $AWK_PROG '$1 == "Rate:" {sub(/\/s/, "", $2); print $2}')
# This can happen for older progs
if [ -z "$init_speed" ]; then
@@ -76,8 +77,9 @@ echo "$target_speed" > "${devinfo_dir}/scrub_speed_max"
# The second scrub, to check the throttled speed.
$BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >> $seqres.full
-speed=$($BTRFS_UTIL_PROG scrub status --raw $SCRATCH_MNT | grep "Rate:" |\
- $AWK_PROG '{print $2}' | cut -f1 -d\/)
+speed=$($BTRFS_UTIL_PROG scrub status --raw $SCRATCH_MNT |\
+ tee -a $seqres.full |\
+ $AWK_PROG '$1 == "Rate:" {sub(/\/s/, "", $2); print $2}')
# We gave a +- 10% tolerance for the throttle
if [ "$speed" -gt "$(( $target_speed * 11 / 10 ))" -o \
--
2.35.3
next prev parent reply other threads:[~2023-12-07 7:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 7:20 [PATCH 0/5] btrfs/282: resolve intermittent failures David Disseldorp
2023-12-07 7:20 ` [PATCH 1/5] common/dmdelay: remove DELAY_X enums David Disseldorp
2023-12-07 7:20 ` David Disseldorp [this message]
2023-12-07 9:46 ` [PATCH 2/5] btrfs/282: append scrub status output to 282.full Qu Wenruo
2023-12-07 7:20 ` [PATCH 3/5] btrfs/282: dmdelay scrub I/O to fix intermittent failures David Disseldorp
2023-12-07 7:20 ` [PATCH 4/5] btrfs/282: reduce scrub dataset size David Disseldorp
2023-12-07 7:20 ` [PATCH 5/5] btrfs/282: increase throttled scrub rate tolerance David Disseldorp
2023-12-07 9:49 ` [PATCH 0/5] btrfs/282: resolve intermittent failures Qu Wenruo
2023-12-07 13:49 ` David Disseldorp
2023-12-07 20:02 ` Qu Wenruo
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=20231207072056.14588-3-ddiss@suse.de \
--to=ddiss@suse.de \
--cc=fstests@vger.kernel.org \
--cc=wqu@suse.com \
/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