From: Kefu Chai <kchai@redhat.com>
Date: Wed, 21 Apr 2021 04:46:22 +0000 (+0800)
Subject: common/optinos: extract crimson options out
X-Git-Tag: v17.1.0~2191^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa50d14b6162dc28604ca8ed2cc73a198330ca70;p=ceph.git

common/optinos: extract crimson options out

prepare for the change to split the options by services

in future, osd will have its own osd.yaml.in, while crimson will consume
both osd.yaml.in and crimson.yaml.in.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/doc/conf.py b/doc/conf.py
index 09a0b077ada1..9b4da176c08c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -231,6 +231,7 @@ ceph_confval_imports = [os.path.join(top_level,
                                      'src/common/options',
                                      yaml + '.yaml.in')
                         for yaml in ['global',
+                                     'crimson',
                                      'immutable-object-cache',
                                      'mds',
                                      'mds-client',
diff --git a/src/common/options/CMakeLists.txt b/src/common/options/CMakeLists.txt
index 8e3cecacd978..6424271e3812 100644
--- a/src/common/options/CMakeLists.txt
+++ b/src/common/options/CMakeLists.txt
@@ -81,6 +81,7 @@ endif()
 
 add_options(global)
 add_options(cephfs-mirror)
+add_options(crimson)
 add_options(mds)
 add_options(mds-client)
 add_options(rbd)
diff --git a/src/common/options/build_options.cc b/src/common/options/build_options.cc
index 8e92a164f126..cf3f5ef6c92d 100644
--- a/src/common/options/build_options.cc
+++ b/src/common/options/build_options.cc
@@ -4,6 +4,7 @@
 #include "build_options.h"
 
 std::vector<Option> get_global_options();
+std::vector<Option> get_crimson_options();
 std::vector<Option> get_rgw_options();
 std::vector<Option> get_rbd_options();
 std::vector<Option> get_rbd_mirror_options();
@@ -23,6 +24,7 @@ std::vector<Option> build_options()
     }
   };
 
+  ingest(get_crimson_options(), "osd");
   ingest(get_rgw_options(), "rgw");
   ingest(get_rbd_options(), "rbd");
   ingest(get_rbd_mirror_options(), "rbd-mirror");
diff --git a/src/common/options/crimson.yaml.in b/src/common/options/crimson.yaml.in
new file mode 100644
index 000000000000..eb4c9d74214a
--- /dev/null
+++ b/src/common/options/crimson.yaml.in
@@ -0,0 +1,25 @@
+# -*- mode: YAML -*-
+---
+
+options:
+- name: crimson_osd_obc_lru_size
+  type: uint
+  level: advanced
+  desc: Number of obcs to cache
+  default: 10
+- name: crimson_osd_scheduler_concurrency
+  type: uint
+  level: advanced
+  desc: The maximum number concurrent IO operations, 0 for unlimited
+  default: 0
+- name: crimson_alien_op_num_threads
+  type: uint
+  level: advanced
+  desc: The number of threads for serving alienized ObjectStore
+  default: 6
+  flags:
+  - startup
+- name: crimson_alien_thread_cpu_cores
+  type: str
+  level: advanced
+  desc: CPU cores on which alienstore threads will run
diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index 53c54b0970f4..e0836379ac00 100644
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -8681,27 +8681,6 @@ options:
   default: true
   tags:
   - client
-- name: crimson_osd_obc_lru_size
-  type: uint
-  level: advanced
-  desc: Number of obcs to cache
-  default: 10
-- name: crimson_osd_scheduler_concurrency
-  type: uint
-  level: advanced
-  desc: The maximum number concurrent IO operations, 0 for unlimited
-  default: 0
-- name: crimson_alien_op_num_threads
-  type: uint
-  level: advanced
-  desc: The number of threads for serving alienized ObjectStore
-  default: 6
-  flags:
-  - startup
-- name: crimson_alien_thread_cpu_cores
-  type: str
-  level: advanced
-  desc: Cpu cores on which alienstore threads will run
 - name: bdev_type
   type: str
   level: advanced