common/options/crimson.yaml.in: Move options to sections

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/common/options/crimson.yaml.in b/src/common/options/crimson.yaml.in
index 6f38eb09d3c7a9e2cc432f2c1845e70c96e36586..f2df2025296b8b14dbd96ea87ff612c19367470e 100644 (file)
--- a/src/common/options/crimson.yaml.in
+++ b/src/common/options/crimson.yaml.in
@@ -2,44 +2,34 @@
 ---
 
 options:
-- name: crimson_osd_obc_lru_size
-  type: uint
-  level: advanced
-  desc: Number of obcs to cache
-  default: 512
-- name: crimson_osd_scheduler_concurrency
-  type: uint
-  level: advanced
-  desc: The maximum number concurrent IO operations, 0 for unlimited
-  default: 0
-- name: crimson_bluestore_num_threads
-  type: uint
-  level: advanced
-  desc: The number of POSIX threads alienized to seastar for serving Bluestore
-  default: 6
-  flags:
-  - startup
+
+# Crimson CPU options:
+
 - name: crimson_cpu_set
   type: str
   level: advanced
-  desc: CPU cores on which seastar reactor threads will run in cpuset(7) format, smp::count is deduced from this option
-  flags:
-  - startup
-- name: crimson_bluestore_cpu_set
-  type: str
-  level: advanced
-  desc: CPU cores on which POSIX threads alienized to seastar will run in cpuset(7) format
+  desc: CPU cores on which seastar reactor threads will run in cpuset(7) format per OSD with pinning.
+  long_desc: CPU cores on which seastar reactor threads will run in cpuset(7) format per OSD with pinning.
+             overrides crimson_cpu_num.
+             smp::count is deduced from this option
   flags:
   - startup
+
 - name: crimson_cpu_num
   type: uint
   level: advanced
   default: 0
-  desc: The number of seastar reactors, overridden if crimson_cpu_set is set
+  desc: The number of CPUs to use for serving seastar reactors per OSD without CPU pinning.
+  long_desc: The number of CPUs to use for serving seastar reactors per OSD without CPU pinning.
+             overridden if crimson_cpu_set is set.
+             smp::count is deduced from this option.
   flags:
   - startup
   min: 0
   max: 32
+
+# Reactor options:
+
 - name: crimson_reactor_task_quota_ms
   type: float
   level: advanced
@@ -49,6 +39,7 @@ options:
              Shorter time between pools will result in larger CPU utilization.
   flags:
   - startup
+
 - name: crimson_reactor_idle_poll_time_us
   type: uint
   level: advanced
@@ -58,6 +49,7 @@ options:
              Longer reactor poll time will result in larger CPU utilization.
   flags:
   - startup
+
 - name: crimson_reactor_io_latency_goal_ms
   type: float
   level: advanced
@@ -69,6 +61,20 @@ options:
              Increasing this value will allow more IO requests to be dispatched concurrently.
   flags:
   - startup
+
+# Crimson OSD options:
+
+- name: crimson_osd_obc_lru_size
+  type: uint
+  level: advanced
+  desc: Number of obcs to cache
+  default: 512
+- name: crimson_osd_scheduler_concurrency
+  type: uint
+  level: advanced
+  desc: The maximum number concurrent IO operations, 0 for unlimited
+  default: 0
+
 - name: crimson_osd_stat_interval
   type: int
   level: advanced
@@ -83,6 +89,23 @@ options:
   flags:
   - startup
 
+# Bluestore options:
+
+- name: crimson_bluestore_num_threads
+  type: uint
+  level: advanced
+  desc: The number of POSIX threads alienized to seastar for serving Bluestore
+  default: 6
+  flags:
+  - startup
+
+- name: crimson_bluestore_cpu_set
+  type: str
+  level: advanced
+  desc: CPU cores on which POSIX threads alienized to seastar will run in cpuset(7) format
+  flags:
+  - startup
+
 # Seastore options
 
 - name: seastore_segment_size