From: shangdehao1 <dehao.shang@intel.com>
Date: Thu, 7 Mar 2019 00:31:29 +0000 (+0800)
Subject: tools: make cache file dir number configurable
X-Git-Tag: v15.0.0~136^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88c4cf1e4a4e8bf0bdf73b7d9b509b36cf73f2af;p=ceph.git

tools: make cache file dir number configurable

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 3a3c3be5a0b4..e6a4d507ccee 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7413,6 +7413,10 @@ static std::vector<Option> get_immutable_object_cache_options() {
     Option("immutable_object_cache_watermark", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0.1)
     .set_description("immutable object cache water mark"),
+
+    Option("immutable_object_cache_dir_num", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(10)
+    .set_description("immutable object cache dir number"),
   });
 }
 
diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc
index df73bd3b1f14..2ca431dbb391 100644
--- a/src/tools/immutable_object_cache/ObjectCacheStore.cc
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc
@@ -28,6 +28,9 @@ ObjectCacheStore::ObjectCacheStore(CephContext *cct)
   m_cache_watermark =
     m_cct->_conf.get_val<double>("immutable_object_cache_watermark");
 
+  m_dir_num =
+    m_cct->_conf.get_val<uint64_t>("immutable_object_cache_dir_num");
+
   if (m_cache_root_dir.back() != '/') {
     m_cache_root_dir += "/";
   }
@@ -233,6 +236,7 @@ int ObjectCacheStore::evict_objects() {
   for (auto& obj : obj_list) {
     do_evict(obj);
   }
+  return 0;
 }
 
 int ObjectCacheStore::do_evict(std::string cache_file) {
diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.h b/src/tools/immutable_object_cache/ObjectCacheStore.h
index 2972f52a3e1a..7176fdfa4130 100644
--- a/src/tools/immutable_object_cache/ObjectCacheStore.h
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.h
@@ -51,8 +51,7 @@ class ObjectCacheStore {
   std::map<uint64_t, librados::IoCtx> m_ioctx_map;
   Mutex m_ioctx_map_lock;
   Policy* m_policy;
-  // TODO(dehao): make this configurable
-  int m_dir_num = 10;
+  uint64_t m_dir_num;
   uint64_t m_object_cache_max_size;
   float m_cache_watermark;
   std::string m_cache_root_dir;