From: Kefu Chai <kchai@redhat.com>
Date: Sat, 29 May 2021 07:03:01 +0000 (+0800)
Subject: crimson/osd/main: do cleanup using defer()
X-Git-Tag: v17.1.0~1802^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37b83f4ed7ca69f105b93bf482cb2289cbaf9a4d;p=ceph.git

crimson/osd/main: do cleanup using defer()

since we do the startup in a seastar thread, we have the luxury of doing
cleanup using the RAII machinery.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 0152e6ce6e58..c8e0e5a6b572 100644
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -214,12 +214,12 @@ int main(int argc, char* argv[])
             );
           }
           sharded_conf().start(init_params.name, cluster_name).get();
-          seastar::engine().at_exit([] {
-            return sharded_conf().stop();
+          auto stop_conf = seastar::defer([] {
+            sharded_conf().stop().get();
           });
           sharded_perf_coll().start().get();
-          seastar::engine().at_exit([] {
-            return sharded_perf_coll().stop();
+          auto stop_perf_coll = seastar::defer([] {
+            sharded_perf_coll().stop().get();
           });
           local_conf().parse_config_files(conf_file_list).get();
           local_conf().parse_argv(ceph_args).get();
@@ -263,8 +263,8 @@ int main(int argc, char* argv[])
               local_conf().get_val<uuid_d>("osd_uuid"),
               local_conf().get_val<uuid_d>("fsid")).get();
           }
-          seastar::engine().at_exit([&] {
-            return osd.stop();
+          auto stop_osd = seastar::defer([&] {
+            osd.stop().get();
           });
           if (config.count("mkkey") || config.count("mkfs")) {
             return EXIT_SUCCESS;