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

database: shutdown: don't shutdown keyspaces yet

Browse Source 
Don't shutdown the keyspaces just yet,
since they are needed during shutdown.

FIXME: restore when #8995 is fixed and no queries are issued
after the database shuts down.

Refs #8995
Fixes #9684

Test: unit(dev)
- scylla-gdb test fails locally with #9677

DTest: update_cluster_layout_tests.py:TestUpdateClusterLayout.simple_add_new_node_while_adding_info_{1,2}_test(dev)
- running now into #8995. dtest fails with unexpected error: "storage_proxy - Exception when communicating with
  127.0.62.4, to read from system_distributed.service_levels:
  seastar::gate_closed_exception (gate closed)"

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
Message-Id: <20211127083348.146649-2-bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2021-11-27 10:33:48 +02:00
committed by Avi Kivity
parent 93367ba55f
commit cf528d7df9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
database.cc
View File

@@ -2076,9 +2076,14 @@ future<> database::shutdown() {
co_await close_tables(database::table_kind::user);
co_await close_tables(database::table_kind::system);
co_await _large_data_handler->stop();
for (auto& [ks_name, ks] : _keyspaces) {
co_await ks.shutdown();
}
// Don't shutdown the keyspaces just yet,
// since they are needed during shutdown.
// FIXME: restore when https://github.com/scylladb/scylla/issues/8995
// is fixed and no queries are issued after the database shuts down.
// (see also https://github.com/scylladb/scylla/issues/9684)
// for (auto& [ks_name, ks] : _keyspaces) {
// co_await ks.shutdown();
// }
}
future<> database::stop() {