From ba9210182b01c64451a4cc6e984a6e010ba80197 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 12 May 2021 11:44:03 +0800 Subject: [PATCH] crimson/os/alienstore: use get_conf() helper do not use cct->_conf.get_val<>, unless we are in alien threads. Signed-off-by: Kefu Chai --- src/crimson/os/alienstore/alien_store.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc index 213750346f5..c999609ab6f 100644 --- a/src/crimson/os/alienstore/alien_store.cc +++ b/src/crimson/os/alienstore/alien_store.cc @@ -21,6 +21,7 @@ #include "os/ObjectStore.h" #include "os/Transaction.h" +#include "crimson/common/config_proxy.h" #include "crimson/common/log.h" #include "crimson/os/futurized_store.h" @@ -56,6 +57,8 @@ public: namespace crimson::os { +using crimson::common::get_conf; + AlienStore::AlienStore(const std::string& path, const ConfigValues& values) : path{path} { @@ -63,10 +66,7 @@ AlienStore::AlienStore(const std::string& path, const ConfigValues& values) g_ceph_context = cct.get(); cct->_conf.set_config_values(values); store = std::make_unique(cct.get(), path); - const auto num_threads = - cct->_conf.get_val("crimson_alien_op_num_threads"); std::vector cpu_cores = _parse_cpu_cores(); - // cores except the first "N_CORES_FOR_SEASTAR" ones will // be used for alien threads scheduling: // [0, N_CORES_FOR_SEASTAR) are reserved for seastar reactors @@ -81,6 +81,8 @@ AlienStore::AlienStore(const std::string& path, const ConfigValues& values) logger().error("{}: unable to get nproc: {}", __func__, errno); } } + const auto num_threads = + get_conf("crimson_alien_op_num_threads"); tp = std::make_unique(num_threads, 128, cpu_cores); } @@ -588,7 +590,7 @@ std::vector AlienStore::_parse_cpu_cores() { std::vector cpu_cores; auto cpu_string = - cct->_conf.get_val("crimson_alien_thread_cpu_cores"); + get_conf("crimson_alien_thread_cpu_cores"); std::string token; std::istringstream token_stream(cpu_string); -- 2.39.5