Commit 2e6dbe75 authored by Changpeng Liu's avatar Changpeng Liu Committed by Ben Walker
Browse files

nvme: reduce default Admin timeout to 30 seconds 



120 seconds is too long for controllers which can't be
setup during initialization, because this value is only
used for Admin commands so also rename as it is.

Change-Id: I0a3d3192252c0f6fc0bef4d8b868eaef2ae40fe3
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448601


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 6129e78d

lib/nvme/nvme_ctrlr.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t 
	}



	if (FIELD_OK(admin_timeout_ms)) {

		opts->admin_timeout_ms = NVME_MAX_TIMEOUT_PERIOD * 1000;

		opts->admin_timeout_ms = NVME_MAX_ADMIN_TIMEOUT_IN_SECS * 1000;

	}



	if (FIELD_OK(header_digest)) {

lib/nvme/nvme_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ extern pid_t g_spdk_nvme_pid; 


#define NVME_MAX_ASYNC_EVENTS	(8)



#define NVME_MAX_TIMEOUT_PERIOD		(120)

#define NVME_MAX_ADMIN_TIMEOUT_IN_SECS	(30)



/* Maximum log page size to fetch for AERs. */

#define NVME_MAX_AER_LOG_SIZE		(4096)

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ test_ctrlr_get_default_ctrlr_opts(void) 
			 sizeof(opts.extended_host_id)) == 0);

	CU_ASSERT(strlen(opts.src_addr) == 0);

	CU_ASSERT(strlen(opts.src_svcid) == 0);

	CU_ASSERT_EQUAL(opts.admin_timeout_ms, NVME_MAX_TIMEOUT_PERIOD * 1000);

	CU_ASSERT_EQUAL(opts.admin_timeout_ms, NVME_MAX_ADMIN_TIMEOUT_IN_SECS * 1000);

}



static void