From: Logan Gunthorpe <logang@deltatee.com> To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, Omar Sandoval <osandov@fb.com> Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>, Michael Moese <mmoese@suse.de>, Theodore Ts'o <tytso@mit.edu>, Johannes Thumshirn <jthumshirn@suse.de>, Stephen Bates <sbates@raithlin.com>, Logan Gunthorpe <logang@deltatee.com> Subject: [PATCH blktests v2 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Date: Wed, 17 Jul 2019 11:12:57 -0600 [thread overview] Message-ID: <20190717171259.3311-11-logang@deltatee.com> (raw) In-Reply-To: <20190717171259.3311-1-logang@deltatee.com> This ensures any test that fails or is interrupted will cleanup their subsystems. This will prevent the system from being left in an inconsistent state that will fail subsequent tests. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> --- tests/nvme/rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/nvme/rc b/tests/nvme/rc index 16bdb7f0c083..a6b4d5938680 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -25,6 +25,49 @@ _test_dev_is_nvme() { } _cleanup_nvmet() { + local dev + local port + local subsys + local transport + local name + + if [[ ! -d "${NVMET_CFS}" ]]; then + return 0 + fi + + # Don't let successive Ctrl-Cs interrupt the cleanup processes + stty -isig + + shopt -s nullglob + + for dev in /sys/class/nvme/nvme*; do + dev="$(basename "$dev")" + transport="$(cat "/sys/class/nvme/${dev}/transport")" + if [[ "$transport" == "loop" ]]; then + echo "WARNING: Test did not clean up loop device: ${dev}" + nvme disconnect -d "${dev}" + fi + done + + for port in "${NVMET_CFS}"/ports/*; do + name=$(basename "${port}") + echo "WARNING: Test did not clean up port: ${name}" + rm -f "${port}"/subsystems/* + rmdir "${port}" + done + + for subsys in "${NVMET_CFS}"/subsystems/*; do + name=$(basename "${subsys}") + echo "WARNING: Test did not clean up subsystem: ${name}" + for ns in "${subsys}"/namespaces/*; do + rmdir "${ns}" + done + rmdir "${subsys}" + done + + shopt -u nullglob + stty isig + modprobe -r nvme-loop modprobe -r nvmet } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: logang@deltatee.com (Logan Gunthorpe) Subject: [PATCH blktests v2 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Date: Wed, 17 Jul 2019 11:12:57 -0600 [thread overview] Message-ID: <20190717171259.3311-11-logang@deltatee.com> (raw) In-Reply-To: <20190717171259.3311-1-logang@deltatee.com> This ensures any test that fails or is interrupted will cleanup their subsystems. This will prevent the system from being left in an inconsistent state that will fail subsequent tests. Signed-off-by: Logan Gunthorpe <logang at deltatee.com> --- tests/nvme/rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/nvme/rc b/tests/nvme/rc index 16bdb7f0c083..a6b4d5938680 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -25,6 +25,49 @@ _test_dev_is_nvme() { } _cleanup_nvmet() { + local dev + local port + local subsys + local transport + local name + + if [[ ! -d "${NVMET_CFS}" ]]; then + return 0 + fi + + # Don't let successive Ctrl-Cs interrupt the cleanup processes + stty -isig + + shopt -s nullglob + + for dev in /sys/class/nvme/nvme*; do + dev="$(basename "$dev")" + transport="$(cat "/sys/class/nvme/${dev}/transport")" + if [[ "$transport" == "loop" ]]; then + echo "WARNING: Test did not clean up loop device: ${dev}" + nvme disconnect -d "${dev}" + fi + done + + for port in "${NVMET_CFS}"/ports/*; do + name=$(basename "${port}") + echo "WARNING: Test did not clean up port: ${name}" + rm -f "${port}"/subsystems/* + rmdir "${port}" + done + + for subsys in "${NVMET_CFS}"/subsystems/*; do + name=$(basename "${subsys}") + echo "WARNING: Test did not clean up subsystem: ${name}" + for ns in "${subsys}"/namespaces/*; do + rmdir "${ns}" + done + rmdir "${subsys}" + done + + shopt -u nullglob + stty isig + modprobe -r nvme-loop modprobe -r nvmet } -- 2.17.1
next prev parent reply other threads:[~2019-07-17 17:13 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-17 17:12 [PATCH blktests v2 00/12] Fix nvme block test issues Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-17 17:12 ` [PATCH blktests v2 01/12] Add filter function for nvme discover Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 6:58 ` Johannes Thumshirn 2019-07-18 6:58 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 02/12] nvme: More agressively filter the discovery output Logan Gunthorpe 2019-07-18 6:59 ` Johannes Thumshirn 2019-07-18 6:59 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 03/12] nvme: Add new test to verify the generation counter Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:03 ` Johannes Thumshirn 2019-07-18 7:03 ` Johannes Thumshirn 2019-07-18 15:55 ` Logan Gunthorpe 2019-07-18 15:55 ` Logan Gunthorpe 2019-07-17 17:12 ` [PATCH blktests v2 04/12] nvme/003,004: Add missing calls to nvme disconnect Logan Gunthorpe 2019-07-17 17:12 ` [PATCH blktests v2 04/12] nvme/003, 004: " Logan Gunthorpe 2019-07-18 7:03 ` [PATCH blktests v2 04/12] nvme/003,004: " Johannes Thumshirn 2019-07-18 7:03 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:04 ` Johannes Thumshirn 2019-07-18 7:04 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 06/12] nvme/015: Ensure the namespace is flushed not the char device Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:04 ` Johannes Thumshirn 2019-07-18 7:04 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 07/12] nvme/018: Ignore error message generated by nvme read Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:05 ` Johannes Thumshirn 2019-07-18 7:05 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 08/12] check: Add the ability to call a cleanup function after a test ends Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:07 ` Johannes Thumshirn 2019-07-18 7:07 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 09/12] nvme: Cleanup modprobe lines into helper functions Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:07 ` Johannes Thumshirn 2019-07-18 7:07 ` Johannes Thumshirn 2019-07-17 17:12 ` Logan Gunthorpe [this message] 2019-07-17 17:12 ` [PATCH blktests v2 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Logan Gunthorpe 2019-07-18 7:08 ` Johannes Thumshirn 2019-07-18 7:08 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param() Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:08 ` Johannes Thumshirn 2019-07-18 7:08 ` Johannes Thumshirn 2019-07-17 17:12 ` [PATCH blktests v2 12/12] nvme: Ignore errors when removing modules Logan Gunthorpe 2019-07-17 17:12 ` Logan Gunthorpe 2019-07-18 7:09 ` Johannes Thumshirn 2019-07-18 7:09 ` Johannes Thumshirn 2019-07-29 17:31 ` [PATCH blktests v2 00/12] Fix nvme block test issues Omar Sandoval 2019-07-29 17:31 ` Omar Sandoval
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=20190717171259.3311-11-logang@deltatee.com \ --to=logang@deltatee.com \ --cc=chaitanya.kulkarni@wdc.com \ --cc=jthumshirn@suse.de \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --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: linkBe 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.