From f7d66a436e1b756b312034b899db3187a877dce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Mon, 11 Nov 2024 06:29:11 -0500 Subject: [PATCH] main: use configure seastar defaults via app_template::seastar_options Instead of the legacy app_template::config. This allows for greater flexibility, as any option's default can be changed this way, not just those few that are promoted to app_template::config. This will be made use of in the next patches. --- main.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/main.cc b/main.cc index bbfd51a1b7..1b8661424d 100644 --- a/main.cc +++ b/main.cc @@ -662,7 +662,7 @@ static int scylla_main(int ac, char** av) { try { runtime::init_uptime(); std::setvbuf(stdout, nullptr, _IOLBF, 1000); - app_template::config app_cfg; + app_template::seastar_options app_cfg; app_cfg.name = "Scylla"; app_cfg.description = R"(scylla - NoSQL data store using the seastar framework @@ -677,17 +677,18 @@ For more information about individual tools, run: scylla {tool_name} --help To start the scylla server proper, simply invoke as: scylla server (or just scylla). )"; - app_cfg.default_task_quota = 500us; #ifdef DEBUG // Increase the task quota to improve work:poll ratio in slow debug mode. - app_cfg.default_task_quota = 5ms; + app_cfg.reactor_opts.task_quota_ms.set_default_value(5); +#else + app_cfg.reactor_opts.task_quota_ms.set_default_value(0.5); #endif app_cfg.auto_handle_sigint_sigterm = false; - app_cfg.max_networking_aio_io_control_blocks = 50000; + app_cfg.reactor_opts.max_networking_io_control_blocks.set_default_value(50000); // We need to have the entire app config to run the app, but we need to // run the app to read the config file with UDF specific options so that // we know whether we need to reserve additional memory for UDFs. - app_cfg.reserve_additional_memory_per_shard = db::config::wasm_udf_reserved_memory; + app_cfg.smp_opts.reserve_additional_memory_per_shard = db::config::wasm_udf_reserved_memory; app_template app(std::move(app_cfg)); auto ext = std::make_shared();