Added "bluestore" prefix to new config options

Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 1def06be07dd7dab3e7d3c8f1b29d266eb23a6e0..f52dcf1ec6a6d6fb11939816dfd50a0453a7f4cb 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -1001,9 +1001,9 @@ OPTION(bluestore_bluefs_reclaim_ratio, OPT_FLOAT, .20) // how much to reclaim at
 // bluestore_block_path = spdk:55cd2e404bd73932
 // If you want to run multiple SPDK instances per node, you must specify the
 // amount of memory per socket each instance will use.
-OPTION(spdk_socket_mem, OPT_STR, "512,512")
+OPTION(bluestore_spdk_socket_mem, OPT_STR, "512,512")
 // A hexadecimal bit mask of the cores to run on. Note the core numbering can change between platforms and should be determined beforehand.
-OPTION(spdk_coremask, OPT_STR, "0x3")
+OPTION(bluestore_spdk_coremask, OPT_STR, "0x3")
 OPTION(bluestore_block_path, OPT_STR, "")
 OPTION(bluestore_block_size, OPT_U64, 10 * 1024*1024*1024)  // 10gb for testing
 OPTION(bluestore_block_create, OPT_BOOL, true)

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 70c28144b85e396984b2e9ed21ea0658c9fa9933..8f983bfbec85393047d74909fbea72b95e9ea47e 100644 (file)
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -631,8 +631,8 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
   string sock_mem = "--socket-mem=";
   string coremask = "-c ";
   prefix += sn_tag;
-  sock_mem += g_conf->spdk_socket_mem;
-  coremask += g_conf->spdk_coremask;
+  sock_mem += g_conf->bluestore_spdk_socket_mem;
+  coremask += g_conf->bluestore_spdk_coremask;
   char *prefix_arg = (char *)prefix.c_str();
   char *sock_mem_arg = (char *)sock_mem.c_str();
   char *coremask_arg = (char *)coremask.c_str();