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 <changcheng.liu@aliyun.com>

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 82c89ae9d5280df5213504b5490e7403bf4cf45e..6e0327af85e850bb16f858a7e50a029863c6e93b 100644 (file)
--- 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<int64_t>("mds_numa_node");

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index 514cb4e3829ba636944e772379a7bd062c83c128..308ce8403d35f92e7b8f52e21d9cfeca4894f820 100644 (file)
--- 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 25c641e9ad3bfedcf68cc749d37cf6eabd658666..ff2ad22efd35780415fefd66ca73f18d6cdc00b8 100644 (file)
--- 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 13efec5d18be8f1ca8facd98af0b00f58b23942a..0a1789626466b6c47220539890eb1ea49890a75c 100644 (file)
--- 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 c59d0228b24f8c2ac74e659e7d4382dbee8050f1..b53d633767f391edc355e27ade5d744032714397 100644 (file)
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -174,8 +174,7 @@ boost::intrusive_ptr<CephContext>
 global_init(const std::map<std::string,std::string> *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 b14ddb57c4c20f9ff110b45734af2ae2c9f10250..5a86222bd3790ba67ee5b5dcf0c76ab0aff9e601 100644 (file)
--- 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 ce49aa97a6a5f64957306800114ebcab0e292361..8e10edd5b71e0f1e2d14d2663b0ef06d605020d7 100644 (file)
--- 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<string> frontends;

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
index 401ad06257498952a053e5ef58cdd26ee1c2fbf0..cf30693baa496844dd7017d13dd8216ac8c76fb9 100644 (file)
--- 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<const char *>::iterator i = args.begin(); i != args.end(); ) {
     if (ceph_argparse_double_dash(args, i)) {