common/options/crimson.yaml.in: Avoid "AlienStore" for user facing

details

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

diff --git a/doc/dev/crimson/crimson.rst b/doc/dev/crimson/crimson.rst
index a1ace675df5108fbd5079cfbd9c94b379b961a02..1b95c35c8b02b38883660b5119490b38d364228d 100644 (file)
--- a/doc/dev/crimson/crimson.rst
+++ b/doc/dev/crimson/crimson.rst
@@ -146,11 +146,11 @@ These backends allow Crimson to interact with legacy or external object store im
 
    The default object store used by the classic ``ceph-osd``. It provides robust, production-grade storage capabilities.
 
-   The ``crimson_alien_op_num_threads`` option needs to be set according to the cpu set available.
+   The ``crimson_bluestore_num_threads`` option needs to be set according to the cpu set available.
    This defines the number of threads dedicated to serving the BlueStore ObjectStore on each OSD.
 
    If ``crimson_cpu_num`` is used from `Crimson CPU allocation`_,
-   The counterpart ``crimson_alien_thread_cpu_cores`` should also be used accordingly to
+   The counterpart ``crimson_bluestore_cpu_set`` should also be used accordingly to
    allow the two sets to be mutually exclusive.
 
 .. describe:: memstore

diff --git a/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml b/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml
index 17e8dddebd25ec767409139c687b89646b173353..c8dc2a2358336c2a2181a4f3e453387135642120 100644 (file)
--- a/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml
@@ -6,7 +6,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml b/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
index 17e8dddebd25ec767409139c687b89646b173353..c8dc2a2358336c2a2181a4f3e453387135642120 100644 (file)
--- a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
@@ -6,7 +6,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml b/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
index e95de9c8831f77f8fe521cacce0f92eb80b5388d..0c7c9721d971c7644590427ef4787b5782ae2ebf 100644 (file)
--- a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
@@ -10,7 +10,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml b/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
index 9f66a02bf279c8ea8c1721ed0475bf6575dbd7e8..4eaf3dd9b1b7430d1756699f0b90ae7112bc2ac1 100644 (file)
--- a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
+++ b/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
@@ -10,7 +10,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-1
       osd.1:

diff --git a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
index 1bcf2bab13c7f3e673866329abcf5a457bfb07fa..eed5e9a77ae75e7c0adf5ac575a5441f7b00ca46 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
@@ -25,7 +25,7 @@ tasks:
     conf:
       osd:
         osd min pg log entries: 5
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-1
       osd.1:

diff --git a/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml b/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
index 4e606bdbec0599e760880245e1f05e534f1730b4..6624e6b2dcc83f2b4efe623b5a13e651311fae7a 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
@@ -23,7 +23,7 @@ tasks:
     conf:
       osd:
         osd min pg log entries: 5
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-1
       osd.1:

diff --git a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
index 17e8dddebd25ec767409139c687b89646b173353..c8dc2a2358336c2a2181a4f3e453387135642120 100644 (file)
--- a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
@@ -6,7 +6,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml
index 17e8dddebd25ec767409139c687b89646b173353..c8dc2a2358336c2a2181a4f3e453387135642120 100644 (file)
--- a/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/thrash_seastore_radosbench/clusters/fixed-2.yaml
@@ -6,7 +6,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
index 17e8dddebd25ec767409139c687b89646b173353..c8dc2a2358336c2a2181a4f3e453387135642120 100644 (file)
--- a/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
@@ -6,7 +6,7 @@ overrides:
     conf:
       osd:
         osd shutdown pgref assert: true
-        crimson alien thread cpu cores: 6-7
+        crimson bluestore cpu set: 6-7
       osd.0:
         crimson cpu set: 0-2
       osd.1:

diff --git a/src/common/options/crimson.yaml.in b/src/common/options/crimson.yaml.in
index 5048e35220febcfea3771ecdd052761c57911f4b..6f38eb09d3c7a9e2cc432f2c1845e70c96e36586 100644 (file)
--- a/src/common/options/crimson.yaml.in
+++ b/src/common/options/crimson.yaml.in
@@ -12,10 +12,10 @@ options:
   level: advanced
   desc: The maximum number concurrent IO operations, 0 for unlimited
   default: 0
-- name: crimson_alien_op_num_threads
+- name: crimson_bluestore_num_threads
   type: uint
   level: advanced
-  desc: The number of threads for serving alienized ObjectStore
+  desc: The number of POSIX threads alienized to seastar for serving Bluestore
   default: 6
   flags:
   - startup
@@ -25,10 +25,10 @@ options:
   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_alien_thread_cpu_cores
+- name: crimson_bluestore_cpu_set
   type: str
   level: advanced
-  desc: CPU cores on which alienstore threads will run in cpuset(7) format
+  desc: CPU cores on which POSIX threads alienized to seastar will run in cpuset(7) format
   flags:
   - startup
 - name: crimson_cpu_num

diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc
index c50fdc796d5ef3f5350eec45fea5af5e64be65e0..643e0282432390fe0efda6fa1dca35bfa44250ef 100644 (file)
--- a/src/crimson/os/alienstore/alien_store.cc
+++ b/src/crimson/os/alienstore/alien_store.cc
@@ -103,21 +103,21 @@ seastar::future<> AlienStore::start()
     ceph_abort_msgf("unsupported objectstore type: %s", type.c_str());
   }
   /*
-   * crimson_alien_thread_cpu_cores must be set for optimal performance.
+   * crimson_bluestore_cpu_set must be set for optimal performance.
    * Otherwise, no CPU pinning will take place.
   */
   std::optional<seastar::resource::cpuset> alien_thread_cpu_cores;
 
   if (std::string conf_cpu_cores =
-        get_conf<std::string>("crimson_alien_thread_cpu_cores");
+        get_conf<std::string>("crimson_bluestore_cpu_set");
       !conf_cpu_cores.empty()) {
-    logger().debug("{} using crimson_alien_thread_cpu_cores", __func__);
+    logger().debug("{} using crimson_bluestore_cpu_set", __func__);
     alien_thread_cpu_cores =
       seastar::resource::parse_cpuset(conf_cpu_cores);
   }
 
   const auto num_threads =
-    get_conf<uint64_t>("crimson_alien_op_num_threads");
+    get_conf<uint64_t>("crimson_bluestore_num_threads");
   tp = std::make_unique<crimson::os::ThreadPool>(num_threads, 128, alien_thread_cpu_cores);
   return tp->start();
 }

diff --git a/src/vstart.sh b/src/vstart.sh
index 1f817fd36a2fcc9b02428cd597c99e9ccbb2cda6..be31edfb7f6b83f9759b70884c938554110f0707 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1227,7 +1227,7 @@ do_balance_cpu() {
 
     local alienstore_interval=${cpu_table[${alienstore_idx}]}
     if [ ! "${alienstore_interval}" == "" ]; then
-        local cmd="$CEPH_BIN/ceph -c $conf_fn config set osd.$osd crimson_alien_thread_cpu_cores ${alienstore_interval}"
+        local cmd="$CEPH_BIN/ceph -c $conf_fn config set osd.$osd crimson_bluestore_cpu_set ${alienstore_interval}"
         echo $cmd
         $cmd
     else
@@ -1810,8 +1810,8 @@ if [ "$ceph_osd" == "crimson-osd" ]; then
     fi
     if [ "$objectstore" == "bluestore" ]; then
         if [ $crimson_alien_num_threads -gt 0 ]; then
-            echo "$CEPH_BIN/ceph -c $conf_fn config set osd crimson_alien_op_num_threads $crimson_alien_num_threads"
-            $CEPH_BIN/ceph -c $conf_fn config set osd crimson_alien_op_num_threads "$crimson_alien_num_threads"
+            echo "$CEPH_BIN/ceph -c $conf_fn config set osd crimson_bluestore_num_threads $crimson_alien_num_threads"
+            $CEPH_BIN/ceph -c $conf_fn config set osd crimson_bluestore_num_threads "$crimson_alien_num_threads"
         fi
     fi
 fi