Commit e764c1d8 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

bdev/nvme: Change NVME_CTRLR_DEBUGLOG() to _INFOLOG() for ctrlr reset 



Ctrlr reset is not in performance critical I/O path. No log gives no
information about progress. Hence, change related NVME_CTRLR_DEBUGLOG()
to NVME_CTRLR_INFOLOG().

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Iaef1333c811f8f2c141b2b8d748a3d864ab16681
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25179


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a2d4b4b1

module/bdev/nvme/bdev_nvme.c

+11 −10
Original line number Diff line number Diff line
@@ -1738,14 +1738,14 @@ bdev_nvme_disconnected_qpair_cb(struct spdk_nvme_qpair *qpair, void *poll_group_ 
			/* We are in a full reset sequence. */

			if (ctrlr_ch->connect_poller != NULL) {

				/* qpair was failed to connect. Abort the reset sequence. */

				NVME_CTRLR_DEBUGLOG(nvme_ctrlr,

				NVME_CTRLR_INFOLOG(nvme_ctrlr,

						   "qpair %p was failed to connect. abort the reset ctrlr sequence.\n",

						   qpair);

				spdk_poller_unregister(&ctrlr_ch->connect_poller);

				status = -1;

			} else {

				/* qpair was completed to disconnect. Just move to the next ctrlr_channel. */

				NVME_CTRLR_DEBUGLOG(nvme_ctrlr,

				NVME_CTRLR_INFOLOG(nvme_ctrlr,

						   "qpair %p was disconnected and freed in a reset ctrlr sequence.\n",

						   qpair);

				status = 0;
@@ -1754,13 +1754,14 @@ bdev_nvme_disconnected_qpair_cb(struct spdk_nvme_qpair *qpair, void *poll_group_ 
			ctrlr_ch->reset_iter = NULL;

		} else {

			/* qpair was disconnected unexpectedly. Reset controller for recovery. */

			NVME_CTRLR_NOTICELOG(nvme_ctrlr, "qpair %p was disconnected and freed. reset controller.\n",

			NVME_CTRLR_INFOLOG(nvme_ctrlr, "qpair %p was disconnected and freed. reset controller.\n",

					   qpair);

			bdev_nvme_failover_ctrlr(nvme_ctrlr);

		}

	} else {

		/* In this case, ctrlr_channel is already deleted. */

		NVME_CTRLR_DEBUGLOG(nvme_ctrlr, "qpair %p was disconnected and freed. delete nvme_qpair.\n", qpair);

		NVME_CTRLR_INFOLOG(nvme_ctrlr, "qpair %p was disconnected and freed. delete nvme_qpair.\n",

				   qpair);

		nvme_qpair_delete(nvme_qpair);

	}

}
@@ -2525,7 +2526,7 @@ bdev_nvme_reset_ctrlr(struct nvme_ctrlr *nvme_ctrlr) 
	nvme_ctrlr->dont_retry = true;



	if (nvme_ctrlr->reconnect_is_delayed) {

		NVME_CTRLR_DEBUGLOG(nvme_ctrlr, "Reconnect is already scheduled.\n");

		NVME_CTRLR_INFOLOG(nvme_ctrlr, "Reconnect is already scheduled.\n");

		msg_fn = bdev_nvme_reconnect_ctrlr_now;

		nvme_ctrlr->reconnect_is_delayed = false;

	} else {