Commit dde21d3b authored Sep 24, 2020 by Shuhei Matsumoto Committed by Tomasz Zawadzki Sep 30, 2020

bdev/nvme: Consolidate the code to create failover path in bdev_nvme_create()



PCIe failover is not supported yet and it is not possible that the
controller is included in g_skipped_nvme_ctrlrs for failover cases.

We can consolidate the code to create failover path in bdev_nvme_create().

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ide456707a0b66a4b26eaf66392b9b53c3e659d9e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4387


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>

parent cced29b5

module/bdev/nvme/bdev_nvme.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -1947,6 +1947,9 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid,
		free(ctx);
		return rc;
		}

		nvme_ctrlr_populate_namespaces_done(ctx);
		return 0;
		}

		if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {
		@@ -1959,11 +1962,6 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid,
		}
		}

		if (existing_ctrlr) {
		nvme_ctrlr_populate_namespaces_done(ctx);
		return 0;
		}

		spdk_nvme_ctrlr_get_default_ctrlr_opts(&ctx->opts, sizeof(ctx->opts));
		ctx->opts.transport_retry_count = g_opts.retry_count;