From 2d64fc3a3eac5ee4c823cf8a40ed9f488b8daaa9 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 4 Nov 2019 15:01:33 +0300 Subject: [PATCH] main: Shut down database with verbose_shutdown helper Signed-off-by: Pavel Emelyanov --- main.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.cc b/main.cc index 3de603c3e0..55eee859e1 100644 --- a/main.cc +++ b/main.cc @@ -748,17 +748,16 @@ int main(int ac, char** av) { dbcfg.memtable_to_cache_scheduling_group = make_sched_group("memtable_to_cache", 200); dbcfg.available_memory = memory::stats().total_memory(); db.start(std::ref(*cfg), dbcfg).get(); - auto stop_database_and_sstables = defer_with_log_on_error([&db] { + auto stop_database_and_sstables = defer_verbose_shutdown("database", [&db] { // #293 - do not stop anything - not even db (for real) //return db.stop(); // call stop on each db instance, but leave the shareded pointers alive. - startlog.info("Shutdown database started"); stop_database(db).then([&db] { return db.invoke_on_all([](auto& db) { return db.stop(); }); }).then([] { - startlog.info("Shutdown database finished"); + startlog.info("Shutting down database: waiting for background jobs..."); return sstables::await_background_jobs_on_all_shards(); }).get(); });