Skip to content

Commit

Permalink
main: initialize scheduling group keys before service levels
Browse files Browse the repository at this point in the history
Due to scylladb/seastar#2231, creating a scheduling group and a
scheduling group key is not safe to do in parallel. The service level
code may attempt to create scheduling groups while
the cql_transport::cql_sg_stats scheduling group key is being created.

Until the seastar issue is fixed, move initialization of the cql sg
states before service level initialization.

Refs: scylladb/seastar#2231
  • Loading branch information
piodul committed May 9, 2024
1 parent 03818c4 commit 55304b9
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,16 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl
dbcfg.commitlog_scheduling_group = make_sched_group("commitlog", "clog", 1000);
dbcfg.available_memory = memory::stats().total_memory();

// Make sure to initialize the scheduling group keys at a point where we are sure
// that nobody else will be creating service levels (e.g. service levels).
// Creating a scheduling group and scheduling group key concurrently
// doesn't work properly. See: https://github.com/scylladb/seastar/issues/2231
scheduling_group_key_config maintenance_cql_sg_stats_cfg =
make_scheduling_group_key_config<cql_transport::cql_sg_stats>(maintenance_socket_enabled::yes);
auto maintenance_cql_sg_stats_key = scheduling_group_key_create(maintenance_cql_sg_stats_cfg).get();
scheduling_group_key_config cql_sg_stats_cfg = make_scheduling_group_key_config<cql_transport::cql_sg_stats>(maintenance_socket_enabled::no);
auto cql_sg_stats_key = scheduling_group_key_create(cql_sg_stats_cfg).get();

supervisor::notify("starting compaction_manager");
// get_cm_cfg is called on each shard when starting a sharded<compaction_manager>
// we need the getter since updateable_value is not shard-safe (#7316)
Expand Down Expand Up @@ -1720,9 +1730,7 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl

maintenance_auth_service.start(perm_cache_config, std::ref(qp), std::ref(group0_client), std::ref(mm_notifier), std::ref(mm), maintenance_auth_config, maintenance_socket_enabled::yes).get();

scheduling_group_key_config maintenance_cql_sg_stats_cfg =
make_scheduling_group_key_config<cql_transport::cql_sg_stats>(maintenance_socket_enabled::yes);
cql_transport::controller cql_maintenance_server_ctl(maintenance_auth_service, mm_notifier, gossiper, qp, service_memory_limiter, sl_controller, lifecycle_notifier, *cfg, scheduling_group_key_create(maintenance_cql_sg_stats_cfg).get(), maintenance_socket_enabled::yes);
cql_transport::controller cql_maintenance_server_ctl(maintenance_auth_service, mm_notifier, gossiper, qp, service_memory_limiter, sl_controller, lifecycle_notifier, *cfg, maintenance_cql_sg_stats_key, maintenance_socket_enabled::yes);

std::any stop_maintenance_auth_service;
std::any stop_maintenance_cql;
Expand Down Expand Up @@ -1948,8 +1956,7 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl

notify_set.notify_all(configurable::system_state::started).get();

scheduling_group_key_config cql_sg_stats_cfg = make_scheduling_group_key_config<cql_transport::cql_sg_stats>(maintenance_socket_enabled::no);
cql_transport::controller cql_server_ctl(auth_service, mm_notifier, gossiper, qp, service_memory_limiter, sl_controller, lifecycle_notifier, *cfg, scheduling_group_key_create(cql_sg_stats_cfg).get(), maintenance_socket_enabled::no);
cql_transport::controller cql_server_ctl(auth_service, mm_notifier, gossiper, qp, service_memory_limiter, sl_controller, lifecycle_notifier, *cfg, cql_sg_stats_key, maintenance_socket_enabled::no);

ss.local().register_protocol_server(cql_server_ctl);

Expand Down

0 comments on commit 55304b9

Please sign in to comment.