ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/nvme: cycle through discovery paths on ctrlr failure

Browse Source 
Also cycle through the discovery paths if the initial
connect_async() operation fails.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I50f36949d9bba0e3bff81505712076f1a1a7aad5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11773
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
This commit is contained in:
Jim Harris 2022-02-24 08:17:55 +00:00
parent 68e5f0ae00
commit 9f860c310f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
module/bdev/nvme/bdev_nvme.c
View File

@ -4665,12 +4665,12 @@ discovery_poller(void *arg)
} else if (ctx->probe_ctx == NULL && ctx->ctrlr == NULL) {
assert(ctx->entry_ctx_in_use == NULL);
ctx->entry_ctx_in_use = TAILQ_FIRST(&ctx->discovery_entry_ctxs);
TAILQ_REMOVE(&ctx->discovery_entry_ctxs, ctx->entry_ctx_in_use, tailq);
trid = &ctx->entry_ctx_in_use->trid;
ctx->probe_ctx = spdk_nvme_connect_async(trid, &ctx->drv_opts, discovery_attach_cb);
if (ctx->probe_ctx) {
TAILQ_REMOVE(&ctx->discovery_entry_ctxs, ctx->entry_ctx_in_use, tailq);
} else {
if (!ctx->probe_ctx) {
DISCOVERY_ERRLOG(ctx, "could not start discovery connect\n");
TAILQ_INSERT_TAIL(&ctx->discovery_entry_ctxs, ctx->entry_ctx_in_use, tailq);
ctx->entry_ctx_in_use = NULL;
}
} else if (ctx->probe_ctx) {
@ -4683,7 +4683,17 @@ discovery_poller(void *arg)
}
}
} else {
spdk_nvme_ctrlr_process_admin_completions(ctx->ctrlr);
rc = spdk_nvme_ctrlr_process_admin_completions(ctx->ctrlr);
if (rc < 0) {
TAILQ_INSERT_TAIL(&ctx->discovery_entry_ctxs, ctx->entry_ctx_in_use, tailq);
ctx->entry_ctx_in_use = NULL;
rc = spdk_nvme_detach_async(ctx->ctrlr, &ctx->detach_ctx);
if (rc != 0) {
DISCOVERY_ERRLOG(ctx, "could not detach discovery ctrlr\n");
ctx->ctrlr = NULL;
}
}
}
return SPDK_POLLER_BUSY;