Commit d8804f6b authored by Marcin Spiewak's avatar Marcin Spiewak Committed by Tomasz Zawadzki
Browse files

lib/nvmf: additional information in logs 



This patch is created to help in debugging
github issue #3366. Some error/warning log
messages are extended to provide additional
information like request state, command or qid.

Change-Id: I2b428ad1f91481f7394dcdef12f1d54aa3a1a047
Signed-off-by: default avatarMarcin Spiewak <marcin.spiewak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/23355


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent 096538c8

lib/nvmf/ctrlr.c

+5 −3
Original line number Diff line number Diff line
@@ -297,8 +297,8 @@ nvmf_ctrlr_add_qpair(struct spdk_nvmf_qpair *qpair, 
			qpair->ctrlr = NULL;

			spdk_nvmf_request_complete(req);

		} else {

			SPDK_WARNLOG("Duplicate QID detected, re-check in %dus\n",

				     DUPLICATE_QID_RETRY_US);

			SPDK_WARNLOG("Duplicate QID (%d) detected, re-check in %dus\n",

				     qpair->qid, DUPLICATE_QID_RETRY_US);

			qpair->connect_req = req;

			/* Set qpair->ctrlr here so that we'll have it when the poller expires. */

			nvmf_qpair_set_ctrlr(qpair, ctrlr);
@@ -324,6 +324,7 @@ _retry_qid_check(void *ctx) 
	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;



	spdk_poller_unregister(&req->poller);

	SPDK_WARNLOG("Retrying adding qpair, qid:%d\n", qpair->qid);

	nvmf_ctrlr_add_qpair(qpair, ctrlr, req);

	return SPDK_POLLER_BUSY;

}
@@ -4385,7 +4386,8 @@ nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
	} else if (spdk_unlikely(req->qpair->first_fused_req != NULL)) {

		struct spdk_nvme_cpl *fused_response = &req->qpair->first_fused_req->rsp->nvme_cpl;



		SPDK_ERRLOG("Expected second of fused commands - failing first of fused commands\n");

		SPDK_ERRLOG("Second fused cmd expected - failing first one (opcode:0x%x)\n",

			    req->qpair->first_fused_req->cmd->nvmf_cmd.opcode);



		/* abort req->qpair->first_fused_request and continue with new command */

		fused_response->status.sc = SPDK_NVME_SC_ABORTED_MISSING_FUSED;

lib/nvmf/tcp.c

+1 −0
Original line number Diff line number Diff line
@@ -3332,6 +3332,7 @@ nvmf_tcp_req_complete(struct spdk_nvmf_request *req) 
		nvmf_tcp_req_set_state(tcp_req, TCP_REQUEST_STATE_COMPLETED);

		break;

	default:

		SPDK_ERRLOG("Unexpected request state %d\n", tcp_req->state);

		assert(0 && "Unexpected request state");

		break;

	}