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

bdev/nvme: Ignore failure of I/O qpair creation if reconnect and retry are enabled

Browse Source 
By a recent improvement, failure of I/O qpair creation is ignored
if the nvme_ctrlr is being reset or scheduled to reconnect.

However, failure of I/O qpair creation is not ignored if a new I/O
channel is allocated. It is normal to allocate a new I/O channel
when a nvme_ctrlr is being reset or scheduled to reconnect.

Fix this bug by relaxing the condition to ignore the result of
bdev_nvme_create_qpair() to if reconnect_delay_sec is non-zero and
bdev_retry_count is non-zero.

If reconnect_delay_sec is non-zero, reconnect will be tried sooner
or later, and if bdev_retry_count is non-zero, submitted IOs will be
queued until it succeeds.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Icf26e1ea65d292f9b8d24966abe25907d2cc33ec
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14446
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2022-09-12 10:22:33 +09:00 committed by Tomasz Zawadzki
parent 7ad783c8a3
commit 6439abc0d8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2305,12 +2305,15 @@ nvme_qpair_create(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ctrlr_channel *ctrl
rc = bdev_nvme_create_qpair(nvme_qpair);
if (rc != 0) {
/* nvme_ctrlr can't create IO qpair if connection is down. If nvme_ctrlr is
* being reset or scheduled to reconnect later, ignore this failure.
* Then IO qpair will be created later when reconnect completes.
* If the user submits IO requests in the meantime, they will be queued and
* resubmitted later */
if (!nvme_ctrlr->resetting && !nvme_ctrlr->reconnect_is_delayed) {
/* nvme_ctrlr can't create IO qpair if connection is down.
*
* If reconnect_delay_sec is non-zero, creating IO qpair is retried
* after reconnect_delay_sec seconds. If bdev_retry_count is non-zero,
* submitted IO will be queued until IO qpair is successfully created.
*
* Hence, if both are satisfied, ignore the failure.
*/
if (nvme_ctrlr->opts.reconnect_delay_sec == 0 || g_opts.bdev_retry_count == 0) {
spdk_put_io_channel(pg_ch);
free(nvme_qpair);
return rc;