From ee6ad7362016c7828d0c81c2cdf48b9b7844964e Mon Sep 17 00:00:00 2001 From: Roman Penyaev Date: Fri, 21 Aug 2020 15:37:53 +0200 Subject: [PATCH] blk/spdk: remove nvme retry count option from NVMEDevice Since 62bb65289dd0 ("nvme: change retry count can be configured via bdev nvme driver") this global variable is removed and there is no easy access to bdev_nvme options, so just remove this config which is hardly used. Signed-off-by: Roman Penyaev --- src/blk/spdk/NVMEDevice.cc | 4 ---- src/common/legacy_config_opts.h | 1 - src/common/options.cc | 4 ---- 3 files changed, 9 deletions(-) diff --git a/src/blk/spdk/NVMEDevice.cc b/src/blk/spdk/NVMEDevice.cc index be417bbdc35..82b294e4191 100644 --- a/src/blk/spdk/NVMEDevice.cc +++ b/src/blk/spdk/NVMEDevice.cc @@ -588,10 +588,6 @@ int NVMEManager::try_get(const spdk_nvme_transport_id& trid, SharedDriverData ** spdk_env_init(&opts); spdk_unaffinitize_thread(); - spdk_nvme_retry_count = g_ceph_context->_conf->bdev_nvme_retry_count; - if (spdk_nvme_retry_count < 0) - spdk_nvme_retry_count = SPDK_NVME_DEFAULT_RETRY_COUNT; - std::unique_lock l(probe_queue_lock); while (!stopping) { if (!probe_queue.empty()) { diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index e4001eb75eb..a73031f8017 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -895,7 +895,6 @@ OPTION(bdev_debug_aio_log_age, OPT_DOUBLE) // to the uio_pci_generic driver. The purpose is to prevent the case where // NVMe driver is loaded while osd is running. OPTION(bdev_nvme_unbind_from_kernel, OPT_BOOL) -OPTION(bdev_nvme_retry_count, OPT_INT) // -1 means by default which is 4 OPTION(bdev_enable_discard, OPT_BOOL) OPTION(bdev_async_discard, OPT_BOOL) diff --git a/src/common/options.cc b/src/common/options.cc index 8113f30b2d0..2f19a5098e9 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -3981,10 +3981,6 @@ std::vector