]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #46669 from tchaikov/wip-crimson-deferred
authorKefu Chai <tchaikov@gmail.com>
Wed, 15 Jun 2022 14:24:36 +0000 (22:24 +0800)
committerGitHub <noreply@github.com>
Wed, 15 Jun 2022 14:24:36 +0000 (22:24 +0800)
crimson/osd: use seastar::deferred_stop()

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
1  2 
src/crimson/osd/main.cc

index 3855a39700c3d6dea9e33d56c3b11eb81c51c2f1,823c82c03b17eeeb5761c129f1c5cc6efbf2cdca..e057779f72ab1339e8e22a29ffdc4774a5c70d0e
@@@ -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();