Merge pull request ceph#63333 from Matan-B/wip-matanb-crimson-poll-mode

common/options/crimson: introduce crimson_poll_mode

Reviewed-by: Yingxin Cheng <[email protected]>

Author: Matan-B

src/common/options/crimson.yaml.in

@@ -85,6 +85,17 @@ options:
   level: advanced
   default: 0
   desc: Report OSD status periodically in seconds, 0 to disable
+
+- name: crimson_poll_mode
+  type: bool
+  level: advanced
+  default: false
+  desc: Let the seastar reactor poll continuously without sleeping at the expense of 100% cpu usage.
+  flags:
+  - startup
+
+# Seastore options
+
 - name: seastore_segment_size
   type: size
   desc: Segment size to use for SegmentManager

src/crimson/osd/main_config_bootstrap_helpers.cc

@@ -95,7 +95,8 @@ struct SeastarOption {
 const std::vector<SeastarOption> seastar_options = {
   {"--task-quota-ms", "crimson_reactor_task_quota_ms", Option::TYPE_FLOAT},
   {"--io-latency-goal-ms", "crimson_reactor_io_latency_goal_ms", Option::TYPE_FLOAT},
-  {"--idle-poll-time-us", "crimson_reactor_idle_poll_time_us", Option::TYPE_UINT}
+  {"--idle-poll-time-us", "crimson_reactor_idle_poll_time_us", Option::TYPE_UINT},
+  {"--poll-mode", "crimson_poll_mode", Option::TYPE_BOOL}
 };
 
 // Function to get the option value as a string
@@ -113,6 +114,12 @@ std::optional<std::string> get_option_value(const SeastarOption& option) {
       }
       break;
     }
+    case Option::TYPE_BOOL: {
+     if (crimson::common::get_conf<bool>(option.config_key)) {
+        return "true";
+      }
+      break;
+    }
     default:
       logger().warn("get_option_value --option_name {} encountered unknown type", option.config_key);
       return std::nullopt;
@@ -184,7 +191,9 @@ _get_early_config(int argc, const char *argv[])
           if (option_value) {
             logger().info("Configure option_name {} with value : {}", option.config_key, option_value);
             ret.early_args.emplace_back(option.option_name);
-            ret.early_args.emplace_back(*option_value);
+            if (option.value_type != Option::TYPE_BOOL) {
+              ret.early_args.emplace_back(*option_value);
+            }
           }
         }
 	if (auto found = std::find_if(

src/vstart.sh

@@ -279,6 +279,7 @@ options:
 	--crimson-alien-num-cores: number of cpus to use for alien threads
 	--crimson-alienstore-physical-only: use only one cpu per physical core for alienstore
 	--crimson-balance-cpu: distribute the Seastar reactors uniformly across OSDs (osd) or NUMA (socket)
+	--crimson-poll-mode: enable poll-mode (100% cpu usage)
 	--osds-per-host: populate crush_location as each host holds the specified number of osds if set
 	--require-osd-and-client-version: if supplied, do set-require-min-compat-client and require-osd-release to specified value
 	--use-crush-tunables: if supplied, set tunables to specified value
@@ -385,6 +386,7 @@ crimson_reactor_physical_only=0
 crimson_alien_num_cores=0
 crimson_alienstore_physical_only=0
 crimson_balance_cpu="" # "osd", "socket"
+crimson_poll_mode=false
 
 while [ $# -ge 1 ]; do
 case $1 in
@@ -634,6 +636,10 @@ case $1 in
         crimson_balance_cpu=$2
         shift
         ;;
+    --crimson-poll-mode)
+        crimson_poll_mode=true
+        shift
+        ;;
     --bluestore-spdk)
         [ -z "$2" ] && usage_exit
         IFS=',' read -r -a bluestore_spdk_dev <<< "$2"
@@ -1254,6 +1260,10 @@ start_osd() {
     do
 	if [ "$ceph_osd" == "crimson-osd" ]; then
         do_balance_cpu $osd
+        if $crimson_poll_mode; then
+            echo "$CEPH_BIN/ceph -c $conf_fn config set osd.$osd crimson_poll_mode true"
+            $CEPH_BIN/ceph -c $conf_fn config set "osd.$osd" crimson_poll_mode true
+        fi
     fi
 	if [ "$new" -eq 1 -o $inc_osd_num -gt 0 ]; then
             wconf <<EOF