From aa50d14b6162dc28604ca8ed2cc73a198330ca70 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 21 Apr 2021 12:46:22 +0800
Subject: [PATCH] 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>
---
 doc/conf.py                         |  1 +
 src/common/options/CMakeLists.txt   |  1 +
 src/common/options/build_options.cc |  2 ++
 src/common/options/crimson.yaml.in  | 25 +++++++++++++++++++++++++
 src/common/options/global.yaml.in   | 21 ---------------------
 5 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 src/common/options/crimson.yaml.in

diff --git a/doc/conf.py b/doc/conf.py
index 09a0b077ada1a..9b4da176c08ca 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 8e3cecacd9781..6424271e38121 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 8e92a164f126c..cf3f5ef6c92de 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 0000000000000..eb4c9d74214ad
--- /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 53c54b0970f4e..e0836379ac00f 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
-- 
2.39.5