From: Omar Sandoval <osandov@osandov.com>
To: Logan Gunthorpe <logang@deltatee.com>
Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Omar Sandoval <osandov@fb.com>, Theodore Ts'o <tytso@mit.edu>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Stephen Bates <sbates@raithlin.com>,
Johannes Thumshirn <jthumshirn@suse.de>,
Michael Moese <mmoese@suse.de>
Subject: Re: [PATCH blktests 02/12] nvme: More agressively filter the discovery output
Date: Mon, 15 Jul 2019 16:07:13 -0700 [thread overview]
Message-ID: <20190715230713.GA5449@vader> (raw)
In-Reply-To: <20190712235742.22646-3-logang@deltatee.com>
On Fri, Jul 12, 2019 at 05:57:32PM -0600, Logan Gunthorpe wrote:
> Comparing the entire output of nvme-cli for discovery is fragile
> and error prone as things change. There's already been the
> long standing issue of the generation counter mismatching
> and also some versions of nvme-cli print an extra "sq flow control
> disable supported" text[1].
>
> Instead, filter out all but a few key values from the discovery
> text which should still be sufficient for this test and much
> less likely to be subject to churn.
>
> [1] https://lore.kernel.org/linux-block/20190505150611.15776-4-minwoo.im.dev@gmail.com/
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> ---
> tests/nvme/002.out | 6001 --------------------------------------------
> tests/nvme/016.out | 7 -
> tests/nvme/017.out | 7 -
> tests/nvme/rc | 4 +-
> 4 files changed, 2 insertions(+), 6017 deletions(-)
[snip]
> diff --git a/tests/nvme/rc b/tests/nvme/rc
> index 22833d8ef9bb..60dc05869726 100644
> --- a/tests/nvme/rc
> +++ b/tests/nvme/rc
> @@ -120,6 +120,6 @@ _find_nvme_loop_dev() {
> }
>
> _filter_discovery() {
> - sed -r -e "s/portid: [0-9]+/portid: X/" \
> - -e "s/Generation counter [0-9]+/Generation counter X/"
> + sed -r -e "s/Generation counter [0-9]+/Generation counter X/" |
> + grep 'Discovery Log Number\|Log Entry\|trtype\|subnqn'
> }
This can be done in a single sed command instead of sed + grep:
sed -rn -e 's/Generation counter [0-9]+/Generation counter X/' \
-e '/Discovery Log Number|Log Entry|trtype|subnqn/p'
next prev parent reply other threads:[~2019-07-15 23:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 23:57 [PATCH blktests 00/12] Fix nvme block test issues Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 01/12] Add filter function for nvme discover Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 03/12] nvme: Add new test to verify the generation counter Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 04/12] nvme/003,004: Add missing calls to nvme disconnect Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 06/12] nvme/015: Ensure the namespace is flushed not the char device Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 07/12] nvme/018: Ignore error message generated by nvme read Logan Gunthorpe
2019-07-15 7:15 ` [PATCH blktests 07/12] nvme/018: Ignore error message generated by nvme read] Johannes Thumshirn
2019-07-15 15:40 ` Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 08/12] check: Add the ability to call a cleanup function after a test ends Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 09/12] nvme: Cleanup modprobe lines into helper functions Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 11/12] common: Use sysfs instead of modinfo for _have_module_param() Logan Gunthorpe
2019-07-15 7:21 ` Johannes Thumshirn
2019-07-15 15:41 ` Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 12/12] nvme: Ignore errors when removing modules Logan Gunthorpe
2019-07-13 0:01 ` [PATCH blktests 00/12] Fix nvme block test issues Logan Gunthorpe
2019-07-15 17:14 ` Chaitanya Kulkarni
[not found] ` <20190712235742.22646-3-logang@deltatee.com>
2019-07-15 23:07 ` Omar Sandoval [this message]
2019-07-15 23:14 ` Omar Sandoval
2019-07-15 23:16 ` Logan Gunthorpe
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=20190715230713.GA5449@vader \
--to=osandov@osandov.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=jthumshirn@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=logang@deltatee.com \
--cc=mmoese@suse.de \
--cc=osandov@fb.com \
--cc=sbates@raithlin.com \
--cc=tytso@mit.edu \
/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).