drop unnecessary env_to_vec calls

global[_pre]_init does this for us now. Signed-off-by: Sage Weil <[email protected]>
zmc · Mar 6, 2018 · 7f23142 · 7f23142
1 parent 4eb0e7e
commit 7f23142
Show file tree

Hide file tree

Showing 54 changed files with 2 additions and 56 deletions.
diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
@@ -77,7 +77,6 @@ int main(int argc, const char **argv, const char *envp[]) {
   if (args.empty()) {
     usage();
   }
-  env_to_vec(args);
 
   std::map<std::string,std::string> defaults = {
     { "pid_file", "" },

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
@@ -99,7 +99,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args,
 			 CEPH_ENTITY_TYPE_MDS, CODE_ENVIRONMENT_DAEMON,

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
@@ -45,7 +45,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "keyring", "$mgr_data/keyring" }

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
@@ -197,7 +197,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   // We need to specify some default values that may be overridden by the
   // user, that are specific to the monitor.  The options we are overriding

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
@@ -110,7 +110,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     // We want to enable leveldb's log, while allowing users to override this

diff --git a/src/librados-config.cc b/src/librados-config.cc
@@ -37,7 +37,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   bool opt_version = false;
   bool opt_vernum = false;

diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
@@ -292,7 +292,6 @@ int main(int argc, char **argv)
   for (auto& i : ceph_option_strings) {
     args.push_back(i.c_str());
   }
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rbd_replay/rbd-replay.cc b/src/rbd_replay/rbd-replay.cc
@@ -58,7 +58,6 @@ int main(int argc, const char **argv) {
   vector<const char*> args;
 
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);
 

diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
@@ -689,7 +689,6 @@ int librgw_create(librgw_t* rgw, int argc, char **argv)
       for (const auto& elt : spl_args) {
 	args.push_back(elt.c_str());
       }
-      env_to_vec(args);
       rc = rgwlib.init(args);
     }
   }

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
@@ -2382,7 +2382,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rgw/rgw_es_main.cc b/src/rgw/rgw_es_main.cc
@@ -14,7 +14,6 @@ int main(int argc, char *argv[])
 {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
@@ -190,7 +190,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   // First, let's determine which frontends are configured.
   int flags = CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS;

diff --git a/src/rgw/rgw_object_expirer.cc b/src/rgw/rgw_object_expirer.cc
@@ -57,7 +57,6 @@ int main(const int argc, const char **argv)
 {
   vector<const char *> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_DAEMON,

diff --git a/src/rgw/rgw_token.cc b/src/rgw/rgw_token.cc
@@ -62,7 +62,6 @@ int main(int argc, char **argv)
   std::string val;
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
@@ -78,7 +78,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
@@ -253,7 +253,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
@@ -39,7 +39,6 @@ int main(int argc, const char **argv)
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_OSD,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/ceph_crypto.cc b/src/test/ceph_crypto.cc
@@ -147,7 +147,6 @@ TEST_F(ForkDeathTest, MD5) {
 
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv + argc);
-  env_to_vec(args);
   auto cct = global_init(NULL, args,
                          CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc
@@ -1421,7 +1421,6 @@ TEST(CrushWrapper, try_remap_rule) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "debug_crush", "0" }

diff --git a/src/test/direct_messenger/test_direct_messenger.cc b/src/test/direct_messenger/test_direct_messenger.cc
@@ -426,7 +426,6 @@ int main(int argc, char **argv)
   // command-line arguments
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_ANY,
                          CODE_ENVIRONMENT_DAEMON, 0);

diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc
@@ -67,7 +67,6 @@ int main(int argc, const char **argv)
 	ts.tv_nsec = 0;
 
 	argv_to_vec(argc, argv, args);
-	env_to_vec(args);
 
 	auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY,
 			       CODE_ENVIRONMENT_UTILITY,

diff --git a/src/test/messenger/simple_server.cc b/src/test/messenger/simple_server.cc
@@ -50,7 +50,6 @@ int main(int argc, const char **argv)
 	cout << "Simple Server starting..." << endl;
 
 	argv_to_vec(argc, argv, args);
-	env_to_vec(args);
 
 	auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY,
 			       CODE_ENVIRONMENT_DAEMON,

diff --git a/src/test/messenger/xio_client.cc b/src/test/messenger/xio_client.cc
@@ -73,7 +73,6 @@ int main(int argc, const char **argv)
 	ts.tv_nsec = 0;
 
 	argv_to_vec(argc, argv, args);
-	env_to_vec(args);
 
 	auto cct = global_init(NULL, args,
 			       CEPH_ENTITY_TYPE_ANY,

diff --git a/src/test/messenger/xio_server.cc b/src/test/messenger/xio_server.cc
@@ -53,7 +53,6 @@ int main(int argc, const char **argv)
 	cout << "Xio Server starting..." << endl;
 
 	argv_to_vec(argc, argv, args);
-	env_to_vec(args);
 
 	global_init(NULL, args, CEPH_ENTITY_TYPE_ANY, CODE_ENVIRONMENT_DAEMON,
 		    0);

diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
@@ -1519,7 +1519,6 @@ TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   g_ceph_context->_conf->set_val("auth_cluster_required", "none");

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
@@ -7071,7 +7071,6 @@ TEST_P(StoreTest, BluestoreRepairTest) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc
@@ -570,7 +570,6 @@ TEST(BlueFS, test_replay) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   map<string,string> defaults = {
     { "debug_bluefs", "1/20" },

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
@@ -1534,7 +1534,6 @@ TEST(BlueStoreRepairer, StoreSpaceTracker)
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
@@ -487,7 +487,6 @@ TEST(DummyTest, ValueParameterizedTestsAreNotSupportedOnThisPlatform) {}
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc
@@ -152,7 +152,6 @@ int main(int argc, const char *argv[])
   // command-line arguments
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_OSD,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
@@ -14,7 +14,6 @@ using namespace std;
 
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv+argc);
-  env_to_vec(args);
   auto cct = global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY,
 			 CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);

diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc
@@ -355,7 +355,6 @@ int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);
 

diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc
@@ -154,7 +154,6 @@ int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc
@@ -394,7 +394,6 @@ TEST(TestRGWManifest, old_obj_manifest) {
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc
@@ -43,7 +43,6 @@ int main(int argc, const char **argv)
   int ret = 0;
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);
   common_init_finish(g_ceph_context);

diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc
@@ -37,7 +37,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/testkeys.cc b/src/test/testkeys.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc
@@ -71,7 +71,6 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/test/unit.cc b/src/test/unit.cc
@@ -35,7 +35,6 @@
  */
 int main(int argc, char **argv) {
   std::vector<const char*> args(argv, argv + argc);
-  env_to_vec(args);
   auto cct = global_init(NULL, args,
 			 CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/ceph-client-debug.cc b/src/tools/ceph-client-debug.cc
@@ -84,7 +84,6 @@ int main(int argc, const char **argv)
   // Argument handling
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY,

diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc
@@ -54,7 +54,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   std::string add_key;
   std::string caps_fn;

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
@@ -174,7 +174,6 @@ int main(int argc, const char **argv)
   std::string dump_format;
 
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
   vector<const char*> orig_args = args;
 
   global_pre_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,

diff --git a/src/tools/ceph_kvstore_tool.cc b/src/tools/ceph_kvstore_tool.cc
@@ -317,7 +317,6 @@ int main(int argc, const char *argv[])
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(
       NULL, args,

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
@@ -3033,7 +3033,6 @@ int main(int argc, char **argv)
   head = (vm.count("head") > 0);
 
   vector<const char *> ceph_options;
-  env_to_vec(ceph_options);
   ceph_options.reserve(ceph_options.size() + ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();

diff --git a/src/tools/cephfs/cephfs-data-scan.cc b/src/tools/cephfs/cephfs-data-scan.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/cephfs/cephfs-journal-tool.cc b/src/tools/cephfs/cephfs-journal-tool.cc
@@ -25,7 +25,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			     CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/cephfs/cephfs-table-tool.cc b/src/tools/cephfs/cephfs-table-tool.cc
@@ -12,7 +12,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                          CODE_ENVIRONMENT_UTILITY, 0);

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
@@ -406,9 +406,8 @@ int main(int argc, const char **argv)
 
   // we use -c, don't confuse the generic arg parsing
   // only parse arguments from CEPH_ARGS, if in the environment
-  vector<const char *> env_args;
-  env_to_vec(env_args);
-  auto cct = global_init(NULL, env_args, CEPH_ENTITY_TYPE_CLIENT,
+  vector<const char *> empty_args;
+  auto cct = global_init(NULL, empty_args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY,
 			 CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   // crushtool times out occasionally when quits. so do not

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
@@ -88,7 +88,6 @@ int main(int argc, const char **argv)
 {
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
-  env_to_vec(args);
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
 			 CODE_ENVIRONMENT_UTILITY,