From 340eaad3bff642b5b24aa4d84aaa7684a8a0bbe3 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Tue, 8 Sep 2020 14:01:25 +0800 Subject: [PATCH] common: remove data_dir_option in func global_init 1. data_dir_option isn't used 2. Align with commit 85f2315b: "remove data_dir_option from common_preinit and global_pre_init" Signed-off-by: Changcheng Liu --- src/ceph_mds.cc | 3 +-- src/ceph_mgr.cc | 3 +-- src/ceph_mon.cc | 2 +- src/ceph_osd.cc | 3 +-- src/global/global_init.cc | 3 +-- src/global/global_init.h | 4 +--- src/rgw/rgw_main.cc | 3 +-- src/rgw/rgw_object_expirer.cc | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 82c89ae9d528..6e0327af85e8 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -91,8 +91,7 @@ int main(int argc, const char **argv) } auto cct = global_init(NULL, args, - CEPH_ENTITY_TYPE_MDS, CODE_ENVIRONMENT_DAEMON, - 0, "mds_data"); + CEPH_ENTITY_TYPE_MDS, CODE_ENVIRONMENT_DAEMON, 0); ceph_heap_profiler_init(); int numa_node = g_conf().get_val("mds_numa_node"); diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc index 514cb4e3829b..308ce8403d35 100644 --- a/src/ceph_mgr.cc +++ b/src/ceph_mgr.cc @@ -58,8 +58,7 @@ int main(int argc, const char **argv) { "keyring", "$mgr_data/keyring" } }; auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_MGR, - CODE_ENVIRONMENT_DAEMON, 0, - "mgr_data"); + CODE_ENVIRONMENT_DAEMON, 0); pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC); diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 25c641e9ad3b..ff2ad22efd35 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -310,7 +310,7 @@ int main(int argc, const char **argv) auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_MON, CODE_ENVIRONMENT_DAEMON, - flags, "mon_data"); + flags); ceph_heap_profiler_init(); std::string val; diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 13efec5d18be..0a1789626466 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -137,8 +137,7 @@ int main(int argc, const char **argv) auto cct = global_init( &defaults, args, CEPH_ENTITY_TYPE_OSD, - CODE_ENVIRONMENT_DAEMON, - 0, "osd_data"); + CODE_ENVIRONMENT_DAEMON, 0); ceph_heap_profiler_init(); Preforker forker; diff --git a/src/global/global_init.cc b/src/global/global_init.cc index c59d0228b24f..b53d633767f3 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -174,8 +174,7 @@ boost::intrusive_ptr global_init(const std::map *defaults, std::vector < const char* >& args, uint32_t module_type, code_environment_t code_env, - int flags, - const char *data_dir_option, bool run_pre_init) + int flags, bool run_pre_init) { // Ensure we're not calling the global init functions multiple times. static bool first_run = true; diff --git a/src/global/global_init.h b/src/global/global_init.h index b14ddb57c4c2..5a86222bd379 100644 --- a/src/global/global_init.h +++ b/src/global/global_init.h @@ -35,9 +35,7 @@ global_init( std::vector < const char* >& args, uint32_t module_type, code_environment_t code_env, - int flags, - const char *data_dir_option = 0, - bool run_pre_init = true); + int flags, bool run_pre_init = true); // just the first half; enough to get config parsed but doesn't start up the // cct or log. diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index ce49aa97a6a5..8e10edd5b71e 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -209,8 +209,7 @@ int radosgw_Main(int argc, const char **argv) flags |= CINIT_FLAG_DEFER_DROP_PRIVILEGES; auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_DAEMON, - flags, "rgw_data"); + CODE_ENVIRONMENT_DAEMON, flags); // First, let's determine which frontends are configured. list frontends; diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc index 401ad0625749..cf30693baa49 100644 --- a/src/rgw/rgw_object_expirer.cc +++ b/src/rgw/rgw_object_expirer.cc @@ -66,7 +66,7 @@ int main(const int argc, const char **argv) auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, - CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS, "rgw_data"); + CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS); for (std::vector::iterator i = args.begin(); i != args.end(); ) { if (ceph_argparse_double_dash(args, i)) { -- 2.47.3