mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cql_test_env: ensure shutdown() before stop() for system_keyspace

Browse Source 
If system_keyspace::stop() is called before system_keyspace::shutdown(),
it will never finish, because the uncleared shared pointers will keep
it alive indefinitely.

Currently this can happen if an exception is thrown before the construction
of the shutdown() defer. This patch moves the shutdown() call to immediately
before stop(). I see no reason why it should be elsewhere.

Fixes scylladb/scylla-enterprise#4380

(cherry picked from commit eeaf4c3443)

Closes scylladb/scylladb#20146
This commit is contained in:
Michał Chojnowski
2024-08-09 14:05:44 +02:00
committed by Avi Kivity
parent 29c352d9c8
commit 136ccff353
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/cql_test_env.cc
View File

@@ -615,7 +615,10 @@ private:
_sl_controller.invoke_on_all(&qos::service_level_controller::start).get();
_sys_ks.start(std::ref(_qp), std::ref(_db)).get();
auto stop_sys_kd = defer([this] { _sys_ks.stop().get(); });
auto stop_sys_kd = defer([this] {
_sys_ks.invoke_on_all(&db::system_keyspace::shutdown).get();
_sys_ks.stop().get();
});
replica::distributed_loader::init_system_keyspace(_sys_ks, _erm_factory, _db).get();
_db.local().maybe_init_schema_commitlog();
@@ -785,9 +788,6 @@ private:
}
group0_client.init().get();
auto stop_system_keyspace = defer([this] {
_sys_ks.invoke_on_all(&db::system_keyspace::shutdown).get();
});
auto shutdown_db = defer([this] {
_db.invoke_on_all(&replica::database::shutdown).get();