From: Yuan Zhou <yuan.zhou@intel.com>
Date: Wed, 23 Jan 2019 15:15:16 +0000 (+0800)
Subject: common/options: move immutable obj cache options out of rbd section
X-Git-Tag: v15.0.0~136^2~33
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a026bada861ea1a62a23df244dffc4f3241c8f28;p=ceph-ci.git

common/options: move immutable obj cache options out of rbd section

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 3f3c795e018..1e9dbc1e4f6 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7035,22 +7035,6 @@ static std::vector<Option> get_rbd_options() {
     .set_default(false)
     .set_description("whether to block writes to the cache before the aio_write call completes"),
 
-    Option("immutable_object_cache_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("/tmp")
-    .set_description("immutable object cache data dir"),
-
-    Option("immutable_object_cache_sock", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("/var/run/ceph/immutable_object_cache_sock")
-    .set_description("immutable object cache domain socket"),
-
-    Option("immutable_object_cache_max_size", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
-    .set_default(1_G)
-    .set_description("max immutable object cache data size"),
-
-    Option("immutable_object_cache_max_inflight_ops", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-    .set_default(128)
-    .set_description("max immutable object caching inflight ops"),
-
     Option("rbd_concurrent_management_ops", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(10)
     .set_min(1)
@@ -7404,6 +7388,26 @@ static std::vector<Option> get_rbd_mirror_options() {
   });
 }
 
+static std::vector<Option> get_immutable_object_cache_options() {
+  return std::vector<Option>({
+    Option("immutable_object_cache_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    .set_default("/tmp")
+    .set_description("immutable object cache data dir"),
+
+    Option("immutable_object_cache_sock", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    .set_default("/var/run/ceph/immutable_object_cache_sock")
+    .set_description("immutable object cache domain socket"),
+
+    Option("immutable_object_cache_max_size", Option::TYPE_SIZE, Option::LEVEL_ADVANCED)
+    .set_default(1_G)
+    .set_description("max immutable object cache data size"),
+
+    Option("immutable_object_cache_max_inflight_ops", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(128)
+    .set_description("max immutable object caching inflight ops"),
+  });
+}
+
 std::vector<Option> get_mds_options() {
   return std::vector<Option>({
     Option("mds_data", Option::TYPE_STR, Option::LEVEL_ADVANCED)
@@ -8157,6 +8161,7 @@ static std::vector<Option> build_options()
   ingest(get_rgw_options(), "rgw");
   ingest(get_rbd_options(), "rbd");
   ingest(get_rbd_mirror_options(), "rbd-mirror");
+  ingest(get_immutable_object_cache_options(), "immutable-objet-cache");
   ingest(get_mds_options(), "mds");
   ingest(get_mds_client_options(), "mds_client");