From 2224554eec639b8c750a84675aa980fea6c1d272 Mon Sep 17 00:00:00 2001 From: JinYu Date: Thu, 13 Jun 2019 21:22:58 +0800 Subject: [PATCH] test/nvme: check_io after reset without setting long time Make it easier to reproduce issue #819 without setting long time. To decrease the UT time. Change-Id: I3dd0268a894113e1a12395618721afee6137588d Signed-off-by: JinYu Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457914 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu --- test/nvme/reset/reset.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/nvme/reset/reset.c b/test/nvme/reset/reset.c index 067fb6bd2..5c92e4c01 100644 --- a/test/nvme/reset/reset.c +++ b/test/nvme/reset/reset.c @@ -287,17 +287,6 @@ work_fn(void *arg) } while (1) { - /* - * Check for completed I/O for each controller. A new - * I/O will be submitted in the io_complete callback - * to replace each I/O that is completed. - */ - ns_ctx = worker->ns_ctx; - while (ns_ctx != NULL) { - check_io(ns_ctx); - ns_ctx = ns_ctx->next; - } - if (!did_reset && ((tsc_end - spdk_get_ticks()) / g_tsc_rate) > (uint64_t)g_time_in_sec / 2) { ns_ctx = worker->ns_ctx; while (ns_ctx != NULL) { @@ -310,6 +299,17 @@ work_fn(void *arg) did_reset = true; } + /* + * Check for completed I/O for each controller. A new + * I/O will be submitted in the io_complete callback + * to replace each I/O that is completed. + */ + ns_ctx = worker->ns_ctx; + while (ns_ctx != NULL) { + check_io(ns_ctx); + ns_ctx = ns_ctx->next; + } + if (spdk_get_ticks() > tsc_end) { break; }