bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

init: RIP init_scheduling_config

Browse Source 
This struct is nowadays only used to transport arguments from db::config
to messaging_service::scheduling_config, things get simpler if dropping it.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2020-07-24 11:11:38 +03:00
parent ef6c75a732
commit 41eee249d7
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
init.cc
View File

@@ -38,7 +38,7 @@ void init_messaging_service(netw::messaging_service::config mscfg
, sstring ms_key
, sstring ms_tls_prio
, bool ms_client_auth
, init_scheduling_config scheduling_config) {
, netw::messaging_service::scheduling_config scfg) {
using encrypt_what = netw::messaging_service::encrypt_what;
using namespace seastar::tls;
@@ -68,10 +68,6 @@ void init_messaging_service(netw::messaging_service::config mscfg
// Init messaging_service
// Delay listening messaging_service until gossip message handlers are registered
netw::messaging_service::scheduling_config scfg;
scfg.statement_tenants = { {scheduling_config.statement, "$user"}, {default_scheduling_group(), "$system"} };
scfg.streaming = scheduling_config.streaming;
scfg.gossip = scheduling_config.gossip;
netw::get_messaging_service().start(mscfg, scfg, creds).get();
}

8
init.hh
View File

@@ -48,19 +48,13 @@ extern logging::logger startlog;
class bad_configuration_error : public std::exception {};
struct init_scheduling_config {
scheduling_group streaming;
scheduling_group statement;
scheduling_group gossip;
};
void init_messaging_service(netw::messaging_service::config cfg
, sstring ms_trust_store
, sstring ms_cert
, sstring ms_key
, sstring ms_tls_prio
, bool ms_client_auth
, init_scheduling_config scheduling_config);
, netw::messaging_service::scheduling_config scheduling_config);
void init_gossiper(sharded<gms::gossiper>& gossiper
, db::config& cfg

7
main.cc
View File

@@ -835,11 +835,12 @@ int main(int ac, char** av) {
mscfg.tcp_nodelay = netw::messaging_service::tcp_nodelay_what::local;
}
init_scheduling_config scfg;
scfg.statement = dbcfg.statement_scheduling_group;
netw::messaging_service::scheduling_config scfg;
scfg.statement_tenants = { {dbcfg.statement_scheduling_group, "$user"}, {default_scheduling_group(), "$system"} };
scfg.streaming = dbcfg.streaming_scheduling_group;
scfg.gossip = scheduling_group();
init_messaging_service(std::move(mscfg), trust_store, cert, key, prio, clauth, scfg);
init_messaging_service(std::move(mscfg), trust_store, cert, key, prio, clauth, std::move(scfg));
init_gossiper(gossiper, *cfg, listen_address, seed_provider, cluster_name);
supervisor::notify("starting storage proxy");