common/options/crimson.yaml.in: Rename crimson seastar cpu cores

Avoid confusing Ceph users with "seastar" terms when possible.

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

diff --git a/doc/dev/crimson/crimson.rst b/doc/dev/crimson/crimson.rst
index 5cb2483056c28c3e1ff51fcf13a820f838f84bf4..a1ace675df5108fbd5079cfbd9c94b379b961a02 100644 (file)
--- a/doc/dev/crimson/crimson.rst
+++ b/doc/dev/crimson/crimson.rst
@@ -84,7 +84,7 @@ For example, for deploying a node with eight CPU cores per OSD:
    ceph config set osd crimson_cpu_num 8
 
 Note that ``crimson_cpu_num`` does **not** pin threads to specific CPU cores.
-To explicitly assign CPU cores to Crimson OSDs, use the ``crimson_seastar_cpu_cores`` parameter.
+To explicitly assign CPU cores to Crimson OSDs, use the ``crimson_cpu_set`` parameter.
 This enables CPU pinning, which *may* improve performance.
 However, using this option requires manually setting the CPU set for each OSD,
 and is generally less recommended due to its complexity.

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 79641f695ab67c14a6135f97f1e4d6a5e4b50ebf..17e8dddebd25ec767409139c687b89646b173353 100644 (file)
--- a/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados-experimental/thrash/clusters/fixed-2.yaml
@@ -8,13 +8,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

diff --git a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml b/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
index 79641f695ab67c14a6135f97f1e4d6a5e4b50ebf..17e8dddebd25ec767409139c687b89646b173353 100644 (file)
--- a/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/basic/clusters/fixed-2.yaml
@@ -8,13 +8,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

diff --git a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml b/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
index 3409ab6d63454172001243fbba4badd547d784e4..e95de9c8831f77f8fe521cacce0f92eb80b5388d 100644 (file)
--- a/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/perf/clusters/fixed-2.yaml
@@ -12,13 +12,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

diff --git a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml b/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
index 2bde4afcda5d217bd2848829c19edb1e4a735b30..9f66a02bf279c8ea8c1721ed0475bf6575dbd7e8 100644 (file)
--- a/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
+++ b/qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml
@@ -12,11 +12,11 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-1
+        crimson cpu set: 0-1
       osd.1:
-        crimson seastar cpu cores: 2-3
+        crimson cpu set: 2-3
       osd.2:
-        crimson seastar cpu cores: 4-5
+        crimson cpu set: 4-5
       global:
         ms cluster mode: crc
         ms service mode: crc

diff --git a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
index ee6d6a9a3356a2de4b9bedb67bd52ba6fcb89e32..1bcf2bab13c7f3e673866329abcf5a457bfb07fa 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-backfill.yaml
@@ -27,10 +27,10 @@ tasks:
         osd min pg log entries: 5
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-1
+        crimson cpu set: 0-1
       osd.1:
-        crimson seastar cpu cores: 2-3
+        crimson cpu set: 2-3
       osd.2:
-        crimson seastar cpu cores: 4-5
+        crimson cpu set: 4-5
       global:
 - osd_backfill:

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 45c01f4ad109666a518c8eb03990a05b7d91a89b..4e606bdbec0599e760880245e1f05e534f1730b4 100644 (file)
--- a/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
+++ b/qa/suites/crimson-rados/singleton/all/osd-pg-splitting.yaml
@@ -25,11 +25,11 @@ tasks:
         osd min pg log entries: 5
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-1
+        crimson cpu set: 0-1
       osd.1:
-        crimson seastar cpu cores: 2-3
+        crimson cpu set: 2-3
       osd.2:
-        crimson seastar cpu cores: 4-5
+        crimson cpu set: 4-5
       global:
 - workunit:
     clients:

diff --git a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml b/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
index 79641f695ab67c14a6135f97f1e4d6a5e4b50ebf..17e8dddebd25ec767409139c687b89646b173353 100644 (file)
--- a/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml
@@ -8,13 +8,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

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 79641f695ab67c14a6135f97f1e4d6a5e4b50ebf..17e8dddebd25ec767409139c687b89646b173353 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
@@ -8,13 +8,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

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 79641f695ab67c14a6135f97f1e4d6a5e4b50ebf..17e8dddebd25ec767409139c687b89646b173353 100644 (file)
--- a/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
+++ b/qa/suites/crimson-rados/thrash_simple/clusters/fixed-2.yaml
@@ -8,13 +8,13 @@ overrides:
         osd shutdown pgref assert: true
         crimson alien thread cpu cores: 6-7
       osd.0:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.1:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       osd.2:
-        crimson seastar cpu cores: 0-2
+        crimson cpu set: 0-2
       osd.3:
-        crimson seastar cpu cores: 3-5
+        crimson cpu set: 3-5
       global:
         ms cluster mode: crc
         ms service mode: crc

diff --git a/src/common/options/crimson.yaml.in b/src/common/options/crimson.yaml.in
index 7a58336ae57126cf81160b5839b9e389b27b2edb..5048e35220febcfea3771ecdd052761c57911f4b 100644 (file)
--- a/src/common/options/crimson.yaml.in
+++ b/src/common/options/crimson.yaml.in
@@ -19,7 +19,7 @@ options:
   default: 6
   flags:
   - startup
-- name: crimson_seastar_cpu_cores
+- 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
@@ -35,7 +35,7 @@ options:
   type: uint
   level: advanced
   default: 0
-  desc: The number of seastar reactors, overridden if crimson_seastar_cpu_cores is set
+  desc: The number of seastar reactors, overridden if crimson_cpu_set is set
   flags:
   - startup
   min: 0

diff --git a/src/crimson/osd/main_config_bootstrap_helpers.cc b/src/crimson/osd/main_config_bootstrap_helpers.cc
index ca2fcf66b2e2412ed1bcb82dafd9e1b2340c8ca0..9f0e1a0b56338683dfab08ec5720840e147b6463 100644 (file)
--- a/src/crimson/osd/main_config_bootstrap_helpers.cc
+++ b/src/crimson/osd/main_config_bootstrap_helpers.cc
@@ -201,9 +201,9 @@ _get_early_config(int argc, const char *argv[])
              std::end(early_args),
              [](auto* arg) { return "--cpuset"sv == arg; });
            found == std::end(early_args)) {
-         auto cpu_cores = crimson::common::get_conf<std::string>("crimson_seastar_cpu_cores");
+         auto cpu_cores = crimson::common::get_conf<std::string>("crimson_cpu_set");
          if (!cpu_cores.empty()) {
-           // Set --cpuset based on crimson_seastar_cpu_cores config option
+           // Set --cpuset based on crimson_cpu_set config option
            // --smp default is one per CPU
            ret.early_args.emplace_back("--cpuset");
            ret.early_args.emplace_back(cpu_cores);
@@ -215,7 +215,7 @@ _get_early_config(int argc, const char *argv[])
            auto reactor_num = crimson::common::get_conf<uint64_t>("crimson_cpu_num");
            if (!reactor_num) {
              // We would like to avoid seastar using all available cores.
-             logger().error("get_early_config: crimson_seastar_cpu_cores"
+             logger().error("get_early_config: crimson_cpu_set"
                             " or crimson_cpu_num must be set");
              ceph_abort();
            }
@@ -230,7 +230,7 @@ _get_early_config(int argc, const char *argv[])
          }
        } else {
          logger().error("get_early_config: --cpuset can be "
-                        "set only using crimson_seastar_cpu_cores");
+                        "set only using crimson_cpu_set");
          ceph_abort();
        }
        return 0;

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 45a830fc1cb41849ca7469a9e0029846c919b807..e368183442c66834e8b402211fbedd9234d0cc3c 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -445,10 +445,9 @@ seastar::future<> OSD::start()
   LOG_PREFIX(OSD::start);
   INFO("seastar::smp::count {}", seastar::smp::count);
   if (auto cpu_cores =
-        local_conf().get_val<std::string>("crimson_seastar_cpu_cores");
+        local_conf().get_val<std::string>("crimson_cpu_set");
       cpu_cores.empty()) {
-    clog->warn() << "for optimal performance please set "
-                    "crimson_seastar_cpu_cores";
+    clog->warn() << "for optimal performance please set crimson_cpu_set";
   }
   startup_time = ceph::mono_clock::now();
   ceph_assert(seastar::this_shard_id() == PRIMARY_CORE);

diff --git a/src/vstart.sh b/src/vstart.sh
index c03a7120543fd66d1d5a1823b830c14988c34db1..1f817fd36a2fcc9b02428cd597c99e9ccbb2cda6 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1213,7 +1213,7 @@ do_balance_cpu() {
 
     local reactor_interval=${cpu_table[${osd}]}
     if ! [ "${reactor_interval}" == "" ]; then
-        local cmd="$CEPH_BIN/ceph -c $conf_fn config set osd.$osd crimson_seastar_cpu_cores ${reactor_interval}"
+        local cmd="$CEPH_BIN/ceph -c $conf_fn config set osd.$osd crimson_cpu_set ${reactor_interval}"
         echo $cmd
         $cmd
     else