From addba1eb1bbe639ac8d0e3ca19575cf0347f3102 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 14 Aug 2025 08:52:44 +0000 Subject: [PATCH] common/options/crimson.yaml.in: Rename crimson seastar cpu cores Avoid confusing Ceph users with "seastar" terms when possible. Signed-off-by: Matan Breizman Signed-off-by: Neha Ojha --- doc/dev/crimson/crimson.rst | 2 +- .../thrash/clusters/fixed-2.yaml | 8 ++++---- qa/suites/crimson-rados/basic/clusters/fixed-2.yaml | 8 ++++---- qa/suites/crimson-rados/perf/clusters/fixed-2.yaml | 8 ++++---- qa/suites/crimson-rados/rbd/clusters/fixed-1.yaml | 6 +++--- qa/suites/crimson-rados/singleton/all/osd-backfill.yaml | 6 +++--- .../crimson-rados/singleton/all/osd-pg-splitting.yaml | 6 +++--- qa/suites/crimson-rados/thrash/clusters/fixed-2.yaml | 8 ++++---- .../thrash_seastore_radosbench/clusters/fixed-2.yaml | 8 ++++---- .../crimson-rados/thrash_simple/clusters/fixed-2.yaml | 8 ++++---- src/common/options/crimson.yaml.in | 4 ++-- src/crimson/osd/main_config_bootstrap_helpers.cc | 8 ++++---- src/crimson/osd/osd.cc | 5 ++--- src/vstart.sh | 2 +- 14 files changed, 43 insertions(+), 44 deletions(-) diff --git a/doc/dev/crimson/crimson.rst b/doc/dev/crimson/crimson.rst index 5cb2483056c28..a1ace675df510 100644 --- 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 79641f695ab67..17e8dddebd25e 100644 --- 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 79641f695ab67..17e8dddebd25e 100644 --- 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 3409ab6d63454..e95de9c8831f7 100644 --- 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 2bde4afcda5d2..9f66a02bf279c 100644 --- 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 ee6d6a9a3356a..1bcf2bab13c7f 100644 --- 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 45c01f4ad1096..4e606bdbec059 100644 --- 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 79641f695ab67..17e8dddebd25e 100644 --- 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 79641f695ab67..17e8dddebd25e 100644 --- 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 79641f695ab67..17e8dddebd25e 100644 --- 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 7a58336ae5712..5048e35220feb 100644 --- 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 ca2fcf66b2e24..9f0e1a0b56338 100644 --- 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("crimson_seastar_cpu_cores"); + auto cpu_cores = crimson::common::get_conf("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("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 45a830fc1cb41..e368183442c66 100644 --- 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("crimson_seastar_cpu_cores"); + local_conf().get_val("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 c03a7120543fd..1f817fd36a2fc 100755 --- 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 -- 2.39.5