From c75442bc2a77ae69351305529721da00a2498fd2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 31 May 2024 11:52:05 +0800 Subject: [PATCH] api: s/rpc/thrift/ replace all occurrences of "rpc" in function names and debugging messages to "thrift", as "rpc" is way too general, and since we are removing "thrift" support, let's take this opportunity to use a more specific name. Signed-off-by: Kefu Chai --- api/api-doc/storage_service.json | 2 +- api/api.cc | 8 ++++---- api/api_init.hh | 4 ++-- api/storage_service.cc | 8 ++++---- api/storage_service.hh | 4 ++-- main.cc | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/api-doc/storage_service.json b/api/api-doc/storage_service.json index 1204e6534f..f0f11d68d3 100644 --- a/api/api-doc/storage_service.json +++ b/api/api-doc/storage_service.json @@ -1693,7 +1693,7 @@ "method":"GET", "summary":"Determine if thrift is running", "type":"boolean", - "nickname":"is_rpc_server_running", + "nickname":"is_thrift_server_running", "produces":[ "application/json" ], diff --git a/api/api.cc b/api/api.cc index f4ebd208d9..486b7c565e 100644 --- a/api/api.cc +++ b/api/api.cc @@ -100,12 +100,12 @@ future<> unset_transport_controller(http_context& ctx) { return ctx.http_server.set_routes([&ctx] (routes& r) { unset_transport_controller(ctx, r); }); } -future<> set_rpc_controller(http_context& ctx) { - return ctx.http_server.set_routes([&ctx] (routes& r) { set_rpc_controller(ctx, r); }); +future<> set_thrift_controller(http_context& ctx) { + return ctx.http_server.set_routes([&ctx] (routes& r) { set_thrift_controller(ctx, r); }); } -future<> unset_rpc_controller(http_context& ctx) { - return ctx.http_server.set_routes([&ctx] (routes& r) { unset_rpc_controller(ctx, r); }); +future<> unset_thrift_controller(http_context& ctx) { + return ctx.http_server.set_routes([&ctx] (routes& r) { unset_thrift_controller(ctx, r); }); } future<> set_server_storage_service(http_context& ctx, sharded& ss, service::raft_group0_client& group0_client) { diff --git a/api/api_init.hh b/api/api_init.hh index aa6bba5f9d..53fea716b6 100644 --- a/api/api_init.hh +++ b/api/api_init.hh @@ -99,8 +99,8 @@ future<> set_server_repair(http_context& ctx, sharded& repair); future<> unset_server_repair(http_context& ctx); future<> set_transport_controller(http_context& ctx, cql_transport::controller& ctl); future<> unset_transport_controller(http_context& ctx); -future<> set_rpc_controller(http_context& ctx); -future<> unset_rpc_controller(http_context& ctx); +future<> set_thrift_controller(http_context& ctx); +future<> unset_thrift_controller(http_context& ctx); future<> set_server_authorization_cache(http_context& ctx, sharded &auth_service); future<> unset_server_authorization_cache(http_context& ctx); future<> set_server_snapshot(http_context& ctx, sharded& snap_ctl); diff --git a/api/storage_service.cc b/api/storage_service.cc index 6029d1c641..05dde9a6e7 100644 --- a/api/storage_service.cc +++ b/api/storage_service.cc @@ -337,16 +337,16 @@ void unset_transport_controller(http_context& ctx, routes& r) { } // NOTE: preserved only for backward compatibility -void set_rpc_controller(http_context& ctx, routes& r) { - ss::is_rpc_server_running.set(r, [] (std::unique_ptr req) { +void set_thrift_controller(http_context& ctx, routes& r) { + ss::is_thrift_server_running.set(r, [] (std::unique_ptr req) { return smp::submit_to(0, [] { return make_ready_future(false); }); }); } -void unset_rpc_controller(http_context& ctx, routes& r) { - ss::is_rpc_server_running.unset(r); +void unset_thrift_controller(http_context& ctx, routes& r) { + ss::is_thrift_server_running.unset(r); } void set_repair(http_context& ctx, routes& r, sharded& repair) { diff --git a/api/storage_service.hh b/api/storage_service.hh index 35d597ee79..72ab6201ec 100644 --- a/api/storage_service.hh +++ b/api/storage_service.hh @@ -79,8 +79,8 @@ void set_repair(http_context& ctx, httpd::routes& r, sharded& re void unset_repair(http_context& ctx, httpd::routes& r); void set_transport_controller(http_context& ctx, httpd::routes& r, cql_transport::controller& ctl); void unset_transport_controller(http_context& ctx, httpd::routes& r); -void set_rpc_controller(http_context& ctx, httpd::routes& r); -void unset_rpc_controller(http_context& ctx, httpd::routes& r); +void set_thrift_controller(http_context& ctx, httpd::routes& r); +void unset_thrift_controller(http_context& ctx, httpd::routes& r); void set_snapshot(http_context& ctx, httpd::routes& r, sharded& snap_ctl); void unset_snapshot(http_context& ctx, httpd::routes& r); seastar::future run_toppartitions_query(db::toppartitions_query& q, http_context &ctx, bool legacy_request = false); diff --git a/main.cc b/main.cc index 86e0c98518..f9a4761428 100644 --- a/main.cc +++ b/main.cc @@ -2020,9 +2020,9 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl api::unset_transport_controller(ctx).get(); }); - api::set_rpc_controller(ctx).get(); - auto stop_rpc_controller = defer_verbose_shutdown("rpc controller API", [&ctx] { - api::unset_rpc_controller(ctx).get(); + api::set_thrift_controller(ctx).get(); + auto stop_thrift_controller = defer_verbose_shutdown("thrift controller API", [&ctx] { + api::unset_thrift_controller(ctx).get(); }); ss.local().register_protocol_server(alternator_ctl, cfg->alternator_port() || cfg->alternator_https_port()).get();