From: Nikolay Borisov <nborisov@suse.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH] btrfs: add new filter for missing devices
Date: Fri, 3 Sep 2021 13:50:47 +0300 [thread overview]
Message-ID: <20210903105047.1118101-1-nborisov@suse.com> (raw)
There are pending changes to btrfs progs which make the output of
'btrfs fi show' more useful w.r.t to misisng devices. I.e instead of
printing a single '*** Some devices missing' at the end it now produces
one line per missing device:
Total devices 2 FS bytes used 128.00KiB
devid 1 size 5.00GiB used 1.26GiB path /dev/loop0
devid 2 size 0 used 0 path /dev/loop1 ***MISSING***
This obviously will break all existing tests so in anticipation for this
change landing the filter is being added.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
common/filter.btrfs | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/common/filter.btrfs b/common/filter.btrfs
index d4169cc69112..37b92478c939 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -13,6 +13,22 @@ _filter_devid()
sed -e "s/\(devid\)\s\+[0-9]\+/\1 <DEVID>/g"
}
+
+# Filter btrfs fi show output to match the old format, before the more verbose
+# missing device lines were add
+_filter_btrfs_missing_line()
+{
+ awk '
+ BEGIN {should_print=0}
+# skip empty lines as btrfs progs inserts such
+ /^$/ {next}
+ !/.*\*\*\*MISSING\*\*\*/ {print $0}
+ /.*\*\*\*MISSING\*\*\*/ {should_print=1}
+# The final \n adds an extra empty line to match with the original output
+ END {if (should_print) {print "\t*** Some devices missing"} print "\n"}
+ '
+}
+
# If passed a number as first arg, filter that number of devices
# If passed a UUID as second arg, filter that exact UUID
_filter_btrfs_filesystem_show()
@@ -31,9 +47,9 @@ _filter_btrfs_filesystem_show()
fi
# the uniq collapses all device lines into 1
- _filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
- _filter_size | _filter_btrfs_version | _filter_devid | \
- _filter_zero_size | \
+ _filter_btrfs_missing_line | _filter_uuid $UUID | _filter_scratch | \
+ _filter_scratch_pool | _filter_size | _filter_btrfs_version | \
+ _filter_devid | _filter_zero_size | \
sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
uniq
}
--
2.17.1
next reply other threads:[~2021-09-03 10:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 10:50 Nikolay Borisov [this message]
2021-09-10 10:44 ` [PATCH] btrfs: add new filter for missing devices 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=20210903105047.1118101-1-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=fstests@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.