From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 15 Jun 2022 14:24:36 +0000 (+0800)
Subject: Merge pull request #46669 from tchaikov/wip-crimson-deferred
X-Git-Tag: v18.0.0~688
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c90ad98042df3a76b1e603f8258a22072762326;p=ceph.git

Merge pull request #46669 from tchaikov/wip-crimson-deferred

crimson/osd: use seastar::deferred_stop()

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

4c90ad98042df3a76b1e603f8258a22072762326
diff --cc src/crimson/osd/main.cc
index 3855a39700c3,823c82c03b17..e057779f72ab
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@@ -238,19 -223,15 +239,15 @@@ int main(int argc, const char* argv[]
                seastar::log_level::debug
              );
            }
 -	  if (config.count("trace")) {
 -	    seastar::global_logger_registry().set_all_loggers_level(
 +          if (config.count("trace")) {
 +            seastar::global_logger_registry().set_all_loggers_level(
                seastar::log_level::trace
              );
 -	  }
 +          }
            sharded_conf().start(init_params.name, cluster_name).get();
-           auto stop_conf = seastar::defer([] {
-             sharded_conf().stop().get();
-           });
+           auto stop_conf = seastar::deferred_stop(sharded_conf());
            sharded_perf_coll().start().get();
-           auto stop_perf_coll = seastar::defer([] {
-             sharded_perf_coll().stop().get();
-           });
+           auto stop_perf_coll = seastar::deferred_stop(sharded_perf_coll());
            local_conf().parse_config_files(conf_file_list).get();
            local_conf().parse_env().get();
            local_conf().parse_argv(config_proxy_args).get();