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

service/storage_service: Make do_isolate_on_error() more robust

Browse Source 
Currently, we only stop the CQL transport server. Extract a
stop_transport() function from drain_on_shutdown() and call it from
do_isolate_on_error() to also shut down the inter-node RPC transport,
Thrift, and other communications services.

Fixes #1353

(cherry picked from commit d72c608868)

Conflicts:
	service/storage_service.cc
This commit is contained in:
Pekka Enberg
2016-06-16 10:28:20 +03:00
parent 787d8f88d3
commit 7e052a4e91
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
service/storage_service.cc
View File

@@ -972,6 +972,28 @@ void storage_service::unregister_subscriber(endpoint_lifecycle_subscriber* subsc
static stdx::optional<future<>> drain_in_progress;
future<> storage_service::stop_transport() {
return run_with_no_api_lock([] (storage_service& ss) {
return seastar::async([&ss] {
logger.info("Stop transport: starts");
gms::get_local_gossiper().stop_gossiping().get();
logger.info("Stop transport: stop_gossiping done");
ss.shutdown_client_servers().get();
logger.info("Stop transport: shutdown rpc and cql server done");
ss.do_stop_ms().get();
logger.info("Stop transport: shutdown messaging_service done");
auth::auth::shutdown().get();
logger.info("Stop transport: auth shutdown");
logger.info("Stop transport: done");
});
});
}
future<> storage_service::drain_on_shutdown() {
return run_with_no_api_lock([] (storage_service& ss) {
if (drain_in_progress) {
@@ -980,17 +1002,8 @@ future<> storage_service::drain_on_shutdown() {
return seastar::async([&ss] {
logger.info("Drain on shutdown: starts");
gms::get_local_gossiper().stop_gossiping().get();
logger.info("Drain on shutdown: stop_gossiping done");
ss.shutdown_client_servers().get();
logger.info("Drain on shutdown: shutdown rpc and cql server done");
ss.do_stop_ms().get();
logger.info("Drain on shutdown: shutdown messaging_service done");
auth::auth::shutdown().get();
logger.info("Drain on shutdown: auth shutdown");
ss.stop_transport().get();
logger.info("Drain on shutdown: stop_transport done");
ss.flush_column_families();
logger.info("Drain on shutdown: flush column_families done");
@@ -2989,7 +3002,7 @@ void storage_service::do_isolate_on_error(disk_error type)
if (must_isolate && !isolated.exchange(true)) {
logger.warn("Shutting down communications due to I/O errors until operator intervention");
// isolated protect us against multiple stops
service::get_storage_service().invoke_on_all([] (service::storage_service& s) { s.stop_native_transport(); });
service::get_local_storage_service().stop_transport();
}
}

2
service/storage_service.hh
View File

@@ -382,6 +382,8 @@ public:
future<> drain_on_shutdown();
future<> stop_transport();
void flush_column_families();
#if 0
/**