mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-31 03:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

transport: Use local notifier to (un)subscribe server

Browse Source 
Now the controller has the lifecycle notifier reference and
can stop using storage service to manage the subscription.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2021-07-22 16:09:38 +03:00
parent 5f99eeb35e
commit 65b1bb8302
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
transport/controller.cc
View File

@@ -22,7 +22,6 @@
#include "transport/controller.hh"
#include "transport/server.hh"
#include "service/memory_limiter.hh"
#include "service/storage_service.hh" // temporary
#include "db/config.hh"
#include "gms/gossiper.hh"
#include "log.hh"
@@ -47,7 +46,6 @@ controller::controller(sharded<auth::service>& auth, sharded<service::migration_
, _sl_controller(sl_controller)
, _config(cfg)
{
(void)_lifecycle_notifier;
}
future<> controller::start_server() {
@@ -220,7 +218,7 @@ future<> controller::do_stop_server() {
future<> controller::subscribe_server(sharded<cql_server>& server) {
return server.invoke_on_all([this] (cql_server& server) {
_mnotifier.local().register_listener(server.get_migration_listener());
service::get_local_storage_service().register_subscriber(server.get_lifecycle_listener());
_lifecycle_notifier.local().register_subscriber(server.get_lifecycle_listener());
return make_ready_future<>();
});
}
@@ -228,7 +226,7 @@ future<> controller::subscribe_server(sharded<cql_server>& server) {
future<> controller::unsubscribe_server(sharded<cql_server>& server) {
return server.invoke_on_all([this] (cql_server& server) {
return _mnotifier.local().unregister_listener(server.get_migration_listener()).then([this, &server]{
return service::get_local_storage_service().unregister_subscriber(server.get_lifecycle_listener());
return _lifecycle_notifier.local().unregister_subscriber(server.get_lifecycle_listener());
});
});
}